original_kernel/drivers/media/rc/keymaps
Linus Torvalds 32aaeffbd4 Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
* 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
  Revert "tracing: Include module.h in define_trace.h"
  irq: don't put module.h into irq.h for tracking irqgen modules.
  bluetooth: macroize two small inlines to avoid module.h
  ip_vs.h: fix implicit use of module_get/module_put from module.h
  nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
  include: replace linux/module.h with "struct module" wherever possible
  include: convert various register fcns to macros to avoid include chaining
  crypto.h: remove unused crypto_tfm_alg_modname() inline
  uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
  pm_runtime.h: explicitly requires notifier.h
  linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
  miscdevice.h: fix up implicit use of lists and types
  stop_machine.h: fix implicit use of smp.h for smp_processor_id
  of: fix implicit use of errno.h in include/linux/of.h
  of_platform.h: delete needless include <linux/module.h>
  acpi: remove module.h include from platform/aclinux.h
  miscdevice.h: delete unnecessary inclusion of module.h
  device_cgroup.h: delete needless include <linux/module.h>
  net: sch_generic remove redundant use of <linux/module.h>
  net: inet_timewait_sock doesnt need <linux/module.h>
  ...

Fix up trivial conflicts (other header files, and  removal of the ab3550 mfd driver) in
 - drivers/media/dvb/frontends/dibx000_common.c
 - drivers/media/video/{mt9m111.c,ov6650.c}
 - drivers/mfd/ab3550-core.c
 - include/linux/dmaengine.h
2011-11-06 19:44:47 -08:00
..
Kconfig
Makefile
rc-adstech-dvb-t-pci.c
rc-alink-dtu-m.c
rc-anysee.c
rc-apac-viewcomp.c
rc-asus-pc39.c
rc-ati-tv-wonder-hd-600.c
rc-ati-x10.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-rm-ks.c
rc-avermedia.c
rc-avertv-303.c
rc-azurewave-ad-tu700.c
rc-behold-columbus.c
rc-behold.c
rc-budget-ci-old.c
rc-cinergy-1400.c
rc-cinergy.c
rc-dib0700-nec.c
rc-dib0700-rc5.c
rc-digitalnow-tinytwin.c
rc-digittrade.c
rc-dm1105-nec.c
rc-dntv-live-dvb-t.c
rc-dntv-live-dvbt-pro.c
rc-em-terratec.c
rc-encore-enltv-fm53.c
rc-encore-enltv.c
rc-encore-enltv2.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.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-leadtek-y04g0051.c
rc-lirc.c
rc-lme2510.c
rc-manli.c
rc-medion-x10.c
rc-msi-digivox-ii.c
rc-msi-digivox-iii.c
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-002t.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-rc6-mce.c
rc-real-audio-220-32-keys.c
rc-snapstream-firefly.c
rc-streamzap.c
rc-tbs-nec.c
rc-technisat-usb2.c
rc-terratec-cinergy-xs.c
rc-terratec-slim-2.c
rc-terratec-slim.c
rc-tevii-nec.c
rc-tivo.c
rc-total-media-in-hand.c
rc-trekstor.c
rc-tt-1500.c
rc-twinhan1027.c
rc-videomate-m1f.c
rc-videomate-s350.c
rc-videomate-tv-pvr.c
rc-winfast-usbii-deluxe.c
rc-winfast.c