android_kernel_xiaomi_sm8350/drivers/media/IR/keymaps
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
Makefile V4L/DVB: IR: Allow not to compile keymaps in 2010-08-08 23:43:00 -03:00
rc-adstech-dvb-t-pci.c
rc-apac-viewcomp.c
rc-asus-pc39.c
rc-ati-tv-wonder-hd-600.c
rc-avermedia-a16d.c
rc-avermedia-cardbus.c
rc-avermedia-dvbt.c
rc-avermedia-m135a.c
rc-avermedia-m733a-rm-k6.c
rc-avermedia.c
rc-avertv-303.c
rc-behold-columbus.c
rc-behold.c
rc-budget-ci-old.c
rc-cinergy-1400.c
rc-cinergy.c
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
rc-dntv-live-dvb-t.c
rc-dntv-live-dvbt-pro.c
rc-em-terratec.c
rc-encore-enltv2.c
rc-encore-enltv-fm53.c
rc-encore-enltv.c
rc-evga-indtube.c
rc-eztv.c
rc-flydvb.c
rc-flyvideo.c
rc-fusionhdtv-mce.c
rc-gadmei-rm008z.c
rc-genius-tvgo-a11mce.c
rc-gotview7135.c
rc-hauppauge-new.c
rc-imon-mce.c
rc-imon-pad.c
rc-iodata-bctv7e.c
rc-kaiomy.c
rc-kworld-315u.c
rc-kworld-plus-tv-analog.c
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
rc-msi-tvanywhere.c
rc-nebula.c
rc-nec-terratec-cinergy-xs.c
rc-norwood.c
rc-npgtech.c
rc-pctv-sedna.c
rc-pinnacle-color.c
rc-pinnacle-grey.c
rc-pinnacle-pctv-hd.c
rc-pixelview-mk12.c
rc-pixelview-new.c
rc-pixelview.c
rc-powercolor-real-angel.c
rc-proteus-2309.c
rc-purpletv.c
rc-pv951.c
rc-rc5-hauppauge-new.c
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
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
rc-tbs-nec.c
rc-terratec-cinergy-xs.c
rc-tevii-nec.c
rc-tt-1500.c
rc-videomate-s350.c
rc-videomate-tv-pvr.c
rc-winfast-usbii-deluxe.c
rc-winfast.c