renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-11-18 07:35:12 +08:00
Code
43b8c08402
linux-next/drivers/parport
History
Linus Torvalds 229aebb873 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
  Update broken web addresses in arch directory.
  Update broken web addresses in the kernel.
  Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
  Revert "Fix typo: configuation => configuration" partially
  ida: document IDA_BITMAP_LONGS calculation
  ext2: fix a typo on comment in ext2/inode.c
  drivers/scsi: Remove unnecessary casts of private_data
  drivers/s390: Remove unnecessary casts of private_data
  net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
  drivers/infiniband: Remove unnecessary casts of private_data
  drivers/gpu/drm: Remove unnecessary casts of private_data
  kernel/pm_qos_params.c: Remove unnecessary casts of private_data
  fs/ecryptfs: Remove unnecessary casts of private_data
  fs/seq_file.c: Remove unnecessary casts of private_data
  arm: uengine.c: remove C99 comments
  arm: scoop.c: remove C99 comments
  Fix typo configue => configure in comments
  Fix typo: configuation => configuration
  Fix typo interrest[ing|ed] => interest[ing|ed]
  Fix various typos of valid in comments
  ...

Fix up trivial conflicts in:
	drivers/char/ipmi/ipmi_si_intf.c
	drivers/usb/gadget/rndis.c
	net/irda/irnet/irnet_ppp.c
2010-10-24 13:41:39 -07:00
..
BUGS-parport
daisy.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
ieee1284_ops.c parport: fix ieee1284_epp_read_addr 2008-02-08 09:22:36 -08:00
ieee1284.c parport: ieee1284: use del_timer_sync() in parport_wait_event() 2009-01-06 15:59:31 -08:00
Kconfig Parport driver: disable pc-style parport on Blackfin systems 2008-11-18 08:10:08 -08:00
Makefile [PATCH] AX88796 parallel port driver 2006-06-25 10:01:09 -07:00
multiface.h
parport_amiga.c m68k: amiga - Parallel port platform device conversion 2010-05-26 19:51:09 +02:00
parport_atari.c m68k: atari - Rename "mfp" to "st_mfp" 2009-02-22 09:23:02 -08:00
parport_ax88796.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
parport_cs.c pcmcia: remove obsolete and wrong comments 2010-09-29 17:20:25 +02:00
parport_gsc.c parport: remove driver_data direct access of struct device 2009-06-15 21:30:28 -07:00
parport_gsc.h remove the bouncing email address of David Campbell 2006-06-26 18:19:23 +02:00
parport_ip32.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
parport_mfc3.c m68k: parport_mfc3 - Not makes it a bool before the comparison. 2009-12-06 11:18:28 +01:00
parport_pc.c parport_pc: show the detection of a 2 serial port ITE8874 chip 2010-08-24 15:21:06 +02:00
parport_serial.c parport_serial: use the PCI IRQ if offered 2010-08-11 08:59:22 -07:00
parport_sunbpp.c of/device: Replace struct of_device with struct platform_device 2010-08-06 09:25:50 -06:00
probe.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
procfs.c sysctl: Drop & in front of every proc_handler. 2009-11-18 08:37:40 -08:00
share.c parport: Semaphore cleanup 2010-10-12 17:36:10 +02:00
TODO-parport