summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/omap/omap_vout.c
diff options
context:
space:
mode:
authorLinus Torvalds2011-12-30 22:45:34 +0100
committerLinus Torvalds2011-12-30 22:45:34 +0100
commit06867fbb8abc936192195e5dcc4b63e12cc78f72 (patch)
tree8f9f6cd2006c2bd3d4d6b4047f84c89e60673605 /drivers/media/video/omap/omap_vout.c
parentMerge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm... (diff)
parentARM: 7237/1: PL330: Fix driver freeze (diff)
downloadkernel-qcow2-linux-06867fbb8abc936192195e5dcc4b63e12cc78f72.tar.gz
kernel-qcow2-linux-06867fbb8abc936192195e5dcc4b63e12cc78f72.tar.xz
kernel-qcow2-linux-06867fbb8abc936192195e5dcc4b63e12cc78f72.zip
Merge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
* 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: ARM: 7237/1: PL330: Fix driver freeze ARM: 7197/1: errata: Remove SMP dependency for erratum 751472 ARM: 7196/1: errata: Remove SMP dependency for erratum 720789 ARM: 7220/1: mmc: mmci: Fixup error handling for dma ARM: 7214/1: mmc: mmci: Fixup handling of MCI_STARTBITERR
Diffstat (limited to 'drivers/media/video/omap/omap_vout.c')
0 files changed, 0 insertions, 0 deletions