alistair23-linux/drivers/media/rc
Linus Torvalds 98793265b4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (53 commits)
  Kconfig: acpi: Fix typo in comment.
  misc latin1 to utf8 conversions
  devres: Fix a typo in devm_kfree comment
  btrfs: free-space-cache.c: remove extra semicolon.
  fat: Spelling s/obsolate/obsolete/g
  SCSI, pmcraid: Fix spelling error in a pmcraid_err() call
  tools/power turbostat: update fields in manpage
  mac80211: drop spelling fix
  types.h: fix comment spelling for 'architectures'
  typo fixes: aera -> area, exntension -> extension
  devices.txt: Fix typo of 'VMware'.
  sis900: Fix enum typo 'sis900_rx_bufer_status'
  decompress_bunzip2: remove invalid vi modeline
  treewide: Fix comment and string typo 'bufer'
  hyper-v: Update MAINTAINERS
  treewide: Fix typos in various parts of the kernel, and fix some comments.
  clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR
  gpio: Kconfig: drop unknown symbol 'CS5535_GPIO'
  leds: Kconfig: Fix typo 'D2NET_V2'
  sound: Kconfig: drop unknown symbol ARCH_CLPS7500
  ...

Fix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new
kconfig additions, close to removed commented-out old ones)
2012-01-08 13:21:22 -08:00
..
keymaps Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 2011-12-20 10:49:39 -08:00
ati_remote.c Merge branch 'driver-core-next' into Linux 3.2 2012-01-06 11:42:52 -08:00
ene_ir.c treewide: Fix comment and string typo 'bufer' 2011-12-06 09:53:40 +01:00
ene_ir.h treewide: Fix comment and string typo 'bufer' 2011-12-06 09:53:40 +01:00
fintek-cir.c [media] fintek-cir: make suspend with active IR more reliable 2011-06-11 09:03:35 -03:00
fintek-cir.h [media] fintek-cir: new driver for Fintek LPC SuperIO CIR function 2011-05-25 20:07:58 -03:00
imon.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
ir-jvc-decoder.c drivers/media: Add module.h to all files using it implicitly 2011-10-31 19:31:51 -04:00
ir-lirc-codec.c Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux 2011-11-06 19:44:47 -08:00
ir-mce_kbd-decoder.c [media] ir-mce_kbd-decoder: include module.h for its facilities 2011-07-29 12:54:38 -03:00
ir-nec-decoder.c drivers/media: Add module.h to all files using it implicitly 2011-10-31 19:31:51 -04:00
ir-raw.c drivers/media: Add export.h for EXPORT_SYMBOL/THIS_MODULE as required 2011-10-31 19:31:51 -04:00
ir-rc5-decoder.c drivers/media: Add module.h to all files using it implicitly 2011-10-31 19:31:51 -04:00
ir-rc5-sz-decoder.c drivers/media: Add module.h to all files using it implicitly 2011-10-31 19:31:51 -04:00
ir-rc6-decoder.c drivers/media: Add module.h to all files using it implicitly 2011-10-31 19:31:51 -04:00
ir-sony-decoder.c drivers/media: Add module.h to all files using it implicitly 2011-10-31 19:31:51 -04:00
ite-cir.c Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2011-07-30 00:08:53 -07:00
ite-cir.h [media] ite-cir: 8709 needs to use pnp resource 2 2011-07-01 16:31:38 -03:00
Kconfig [media] ati_remote: update Kconfig description 2011-09-22 10:55:10 -03:00
lirc_dev.c [media] lirc_dev: store cdev in irctl, up maxdevs 2011-06-11 09:03:20 -03:00
Makefile [media] move ati_remote driver from input/misc to media/rc 2011-09-22 10:47:41 -03:00
mceusb.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
nuvoton-cir.c [media] nuvoton-cir: simplify raw IR sample handling 2011-09-11 09:33:40 -03:00
nuvoton-cir.h [media] nuvoton-cir: simplify raw IR sample handling 2011-09-11 09:33:40 -03:00
rc-core-priv.h [media] media, rc: Use static inline functions to kill warnings 2011-09-23 23:50:52 -03:00
rc-loopback.c [media] rc-core: lirc use unsigned int 2011-07-27 17:52:59 -03:00
rc-main.c switch device_get_devnode() and ->devnode() to umode_t * 2012-01-03 22:54:55 -05:00
redrat3.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
streamzap.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
winbond-cir.c misc latin1 to utf8 conversions 2012-01-02 13:04:55 +01:00