UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenCloudOS-Kernel/drivers/media/IR
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
..
keymaps Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-10-24 13:41:39 -07:00
Kconfig V4L/DVB: Fix IR_CORE dependencies 2010-08-12 15:07:48 -03:00
Makefile V4L/DVB: IR: Port ene driver to new IR subsystem and enable it 2010-08-08 23:43:00 -03:00
ene_ir.c V4L/DVB: IR: Port ene driver to new IR subsystem and enable it 2010-08-08 23:43:00 -03:00
ene_ir.h V4L/DVB: IR: Port ene driver to new IR subsystem and enable it 2010-08-08 23:43:00 -03:00
imon.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
ir-core-priv.h V4L/DVB: IR: extend interfaces to support more device settings 2010-08-08 23:43:00 -03:00
ir-functions.c V4L/DVB: ir-core: move subsystem internal calls to ir-core-priv.h 2010-05-19 12:57:04 -03:00
ir-jvc-decoder.c V4L/DVB: IR: JVC: make repeat work 2010-08-08 23:42:59 -03:00
ir-keytable.c V4L/DVB: IR: fix keys beeing stuck down forever 2010-09-27 22:21:55 -03:00
ir-lirc-codec.c Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl 2010-10-22 10:52:56 -07:00
ir-nec-decoder.c V4L/DVB: IR: NECX: support repeat 2010-08-08 23:42:59 -03:00
ir-raw-event.c V4L/DVB: IR: ir-raw-event: null pointer dereference 2010-09-27 22:21:46 -03:00
ir-rc5-decoder.c V4L/DVB: ir-core: move decoding state to ir_raw_event_ctrl 2010-08-02 14:55:15 -03:00
ir-rc6-decoder.c V4L/DVB: ir-core: move decoding state to ir_raw_event_ctrl 2010-08-02 14:55:15 -03:00
ir-sony-decoder.c V4L/DVB: ir-core: move decoding state to ir_raw_event_ctrl 2010-08-02 14:55:15 -03:00
ir-sysfs.c V4L/DVB: ir-core: Fix null dereferences in the protocols sysfs interface 2010-09-30 07:18:37 -03:00
lirc_dev.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
mceusb.c V4L/DVB: mceusb: add two new ASUS device IDs 2010-09-27 22:21:52 -03:00
rc-map.c V4L/DVB: IR: Allow not to compile keymaps in 2010-08-08 23:43:00 -03:00
streamzap.c V4L/DVB: IR: put newly ported streamzap driver in proper home 2010-08-08 23:42:58 -03:00