kevin/linux
1
Fork 0
Code
f9a5279c70
linux/drivers/staging/lirc
History
Linus Torvalds f063a0c0c9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (841 commits)
  Staging: brcm80211: fix usage of roundup in structures
  Staging: bcm: fix up network device reference counting
  Staging: keucr: fix up US_ macro change
  staging: brcm80211: brcmfmac: Removed codeversion from firmware filenames.
  staging: brcm80211: Remove unnecessary header files.
  staging: brcm80211: Remove unnecessary includes from bcmutils.c
  staging: brcm80211: Removed unnecessary pktsetprio() function.
  Staging: brcm80211: remove typedefs.h
  Staging: brcm80211: remove uintptr typedef usage
  Staging: hv: remove struct vmbus_channel_interface
  Staging: hv: remove Open from struct vmbus_channel_interface
  Staging: hv: storvsc: call vmbus_open directly
  Staging: hv: netvsc: call vmbus_open directly
  Staging: hv: channel: export vmbus_open to modules
  Staging: hv: remove Close from struct vmbus_channel_interface
  Staging: hv: netvsc: call vmbus_close directly
  Staging: hv: storvsc: call vmbus_close directly
  Staging: hv: channel: export vmbus_close to modules
  Staging: hv: remove SendPacket from struct vmbus_channel_interface
  Staging: hv: storvsc: call vmbus_sendpacket directly
  ...

Fix up conflicts in
	drivers/staging/cx25821/cx25821-audio-upstream.c
	drivers/staging/cx25821/cx25821-audio.h
due to warring whitespace cleanups (neither of which were all that great)
2010-10-28 12:13:00 -07:00
..
Kconfig [media] lirc_parallel: build on smp and kill dead code 2010-10-22 20:05:36 -02:00
lirc_bt829.c V4L/DVB: staging/lirc: CodingStyle cleanups 2010-08-02 16:43:35 -03:00
lirc_ene0100.h
lirc_i2c.c V4L/DVB: staging/lirc: add lirc_i2c driver 2010-08-02 16:43:22 -03:00
lirc_igorplugusb.c [media] lirc_igorplugusb: add Fit PC2 device ID 2010-10-22 20:05:37 -02:00
lirc_imon.c Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
lirc_it87.c Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2010-10-28 09:35:11 -07:00
lirc_it87.h V4L/DVB: staging/lirc: add lirc_it87 driver 2010-08-02 16:43:26 -03:00
lirc_ite8709.c [media] staging/lirc: ioctl portability fixups 2010-10-21 01:18:35 -02:00
lirc_parallel.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2010-10-28 12:13:00 -07:00
lirc_parallel.h V4L/DVB: staging/lirc: add lirc_parallel driver 2010-08-02 16:43:27 -03:00
lirc_sasem.c Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
lirc_serial.c Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2010-10-28 09:35:11 -07:00
lirc_sir.c Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2010-10-28 09:35:11 -07:00
lirc_ttusbir.c V4L/DVB: staging/lirc: CodingStyle cleanups 2010-08-02 16:43:35 -03:00
lirc_zilog.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2010-10-28 12:13:00 -07:00
Makefile V4L/DVB: STAGING: remove lirc_ene0100 driver 2010-08-08 23:43:00 -03:00
TODO V4L/DVB: staging/lirc: wire up Kconfig and Makefile bits 2010-08-02 16:43:34 -03:00
TODO.lirc_i2c V4L/DVB: staging: Add an specific TODO note for lirc_i2c 2010-08-02 16:43:23 -03:00