]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'v4l-dvb/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Oct 2012 23:07:56 +0000 (10:07 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Oct 2012 23:07:56 +0000 (10:07 +1100)
commit71003e6622d9524ef1e54777a560672dfff284f8
tree1ae50673d8713c0822fdb5771c112c7d632f516b
parent4e62b937c973cea8447adbabf88a86afe6fdea7a
parentc3c0b61133a02c50109f09563677fd9bfb314cbb
Merge remote-tracking branch 'v4l-dvb/master'

Conflicts:
arch/arm/mach-davinci/include/mach/da8xx.h
arch/arm/mach-davinci/da850.c
arch/arm/mach-davinci/dm644x.c
arch/arm/mach-davinci/include/mach/da8xx.h
arch/arm/mach-exynos/mach-nuri.c
arch/arm/mach-exynos/mach-origen.c
arch/arm/mach-exynos/mach-universal_c210.c
drivers/media/pci/bt8xx/bttv-driver.c
drivers/media/pci/cx88/cx88-mpeg.c
drivers/media/usb/em28xx/em28xx-cards.c