leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
ff4b8a57f0
linux/drivers/media/rc
History
Greg Kroah-Hartman ff4b8a57f0 Merge branch 'driver-core-next' into Linux 3.2 
This resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,
and it fixes the build error in the arch/x86/kernel/microcode_core.c
file, that the merge did not catch.

The microcode_core.c patch was provided by Stephen Rothwell
<sfr@canb.auug.org.au> who was invaluable in the merge issues involved
with the large sysdev removal process in the driver-core tree.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2012-01-06 11:42:52 -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 [media] ene_ir: Use current logging styles 2011-09-03 20:57:09 -03:00
ene_ir.h [media] ene_ir: Use current logging styles 2011-09-03 20:57:09 -03: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 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
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 [media] winbond-cir: Use current logging styles 2011-09-03 20:58:05 -03:00