openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/drivers/media/IR/keymaps
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
..
Kconfig V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
Makefile V4L/DVB: IR: Allow not to compile keymaps in 2010-08-08 23:43:00 -03:00
rc-adstech-dvb-t-pci.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-apac-viewcomp.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-asus-pc39.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-ati-tv-wonder-hd-600.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-avermedia-a16d.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-avermedia-cardbus.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-avermedia-dvbt.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-avermedia-m135a.c V4L/DVB: saa7134: add RM-K6 remote control support for Avermedia M135A 2010-06-01 01:22:09 -03:00
rc-avermedia-m733a-rm-k6.c V4L/DVB: saa7134: add support for Avermedia M733A 2010-06-01 01:21:52 -03:00
rc-avermedia.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-avertv-303.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-behold-columbus.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-behold.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-budget-ci-old.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-cinergy-1400.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-cinergy.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-dib0700-nec.c V4L/DVB: standardize names at rc-dib0700 tables 2010-08-02 16:43:53 -03:00
rc-dib0700-rc5.c V4L/DVB: standardize names at rc-dib0700 tables 2010-08-02 16:43:53 -03:00
rc-dm1105-nec.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-dntv-live-dvb-t.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-dntv-live-dvbt-pro.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-em-terratec.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-encore-enltv-fm53.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-encore-enltv.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-encore-enltv2.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-evga-indtube.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-eztv.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-flydvb.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-flyvideo.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-fusionhdtv-mce.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-gadmei-rm008z.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-genius-tvgo-a11mce.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-gotview7135.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-hauppauge-new.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-imon-mce.c V4L/DVB: IR/imon: convert to ir-core protocol change handling 2010-05-19 12:58:24 -03:00
rc-imon-pad.c V4L/DVB: IR/imon: convert to ir-core protocol change handling 2010-05-19 12:58:24 -03:00
rc-iodata-bctv7e.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-kaiomy.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-kworld-315u.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-kworld-plus-tv-analog.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-lirc.c V4L/DVB: IR: add empty lirc pseudo-keymap 2010-08-02 15:18:02 -03:00
rc-manli.c Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
rc-msi-tvanywhere-plus.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-msi-tvanywhere.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-nebula.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-nec-terratec-cinergy-xs.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-norwood.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-npgtech.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-pctv-sedna.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-pinnacle-color.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-pinnacle-grey.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-pinnacle-pctv-hd.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-pixelview-mk12.c V4L/DVB: ir-core: Add support for badly-implemented hardware decoders 2010-05-19 12:56:58 -03:00
rc-pixelview-new.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-pixelview.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-powercolor-real-angel.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-proteus-2309.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-purpletv.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-pv951.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-rc5-hauppauge-new.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-rc5-streamzap.c V4L/DVB: staging/lirc: port lirc_streamzap to ir-core 2010-08-08 23:42:58 -03:00
rc-rc5-tv.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-rc6-mce.c V4L/DVB: IR: extend MCE keymap 2010-09-27 22:21:56 -03:00
rc-real-audio-220-32-keys.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-tbs-nec.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-terratec-cinergy-xs.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-tevii-nec.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-tt-1500.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-videomate-s350.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-videomate-tv-pvr.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-winfast-usbii-deluxe.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00
rc-winfast.c V4L/DVB: Break Remote Controller keymaps into modules 2010-05-19 12:56:49 -03:00