summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-05-19 08:31:29 +0200
committerOlof Johansson <olof@lixom.net>2012-05-19 08:31:29 +0200
commit19a64d9d591f9d188707e86e53bc0c4ed99ac8f0 (patch)
tree189b0be9a34730f9ea02c1e4bfb2cd0787c00367 /drivers/video
parentMerge branch 'ux500/delete-u5500' into next/soc (diff)
parentARM: mach-shmobile: sh73a0: fixup PINT/IRQ16-IRQ31 irq number conflict (diff)
downloadlinux-19a64d9d591f9d188707e86e53bc0c4ed99ac8f0.tar.xz
linux-19a64d9d591f9d188707e86e53bc0c4ed99ac8f0.zip
Merge branch 'soc-core' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas into next/soc
Repeat pull of soc-core to bring in a bugfix. * 'soc-core' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas: ARM: mach-shmobile: sh73a0: fixup PINT/IRQ16-IRQ31 irq number conflict
Diffstat (limited to 'drivers/video')
0 files changed, 0 insertions, 0 deletions