summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-05-09 20:27:00 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-09 20:27:00 +0200
commit7ee94d97aafacf5a019b3578e0eae6daa2e2bcd5 (patch)
tree3626d3014c7935b09274bd3821cfb2ba2fd3c504 /include/media
parentMerge tag 'regmap-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broon... (diff)
parentMerge tag 'omap-fixes-for-v3.4-rc6-take-2' of git://git.kernel.org/pub/scm/li... (diff)
downloadlinux-7ee94d97aafacf5a019b3578e0eae6daa2e2bcd5.tar.xz
linux-7ee94d97aafacf5a019b3578e0eae6daa2e2bcd5.zip
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM: SoC fixes from Olof Johansson: "Things have slowed down a lot for us, but we have five more fixes for omap and kirkwood below. Three are for boards setup issues, two are SoC-level fixes." * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: OMAP: igep0020: fix smsc911x dummy regulator id ARM: orion5x: Fix GPIO enable bits for MPP9 ARM: kirkwood: add missing kexec.h include ARM: OMAP: Revert "ARM: OMAP: ctrl: Fix CONTROL_DSIPHY register fields" ARM: OMAP1: Amstrad Delta: Fix wrong IRQ base in FIQ handler
Diffstat (limited to 'include/media')
0 files changed, 0 insertions, 0 deletions