summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/prm.h
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-11-01 02:25:41 +0400
committerArnd Bergmann <arnd@arndb.de>2011-11-01 02:25:41 +0400
commit3e965b176341b78620f7404fd8b7f9a0d061f8a2 (patch)
treea2dbf06d6ae20fbe417b70f0a471cc4f93ff0a71 /arch/arm/mach-omap2/prm.h
parent034ee299122c6b145d6d3cafb9ef5c329a4ab990 (diff)
parent5839fec9d8db35b2b07359b18a77295418e239ad (diff)
downloadlinux-3e965b176341b78620f7404fd8b7f9a0d061f8a2.tar.xz
Merge branch 'next/fixes' into next/cleanup
Conflicts: arch/arm/mach-mxs/include/mach/gpio.h arch/arm/plat-mxc/include/mach/gpio.h drivers/video/omap/lcd_apollon.c drivers/video/omap/lcd_ldp.c drivers/video/omap/lcd_overo.c
Diffstat (limited to 'arch/arm/mach-omap2/prm.h')
0 files changed, 0 insertions, 0 deletions