Home
last modified time | relevance | path

Searched hist:"99 f0b8d6" (Results 1 – 1 of 1) sorted by relevance

/openbmc/linux/arch/arm/mach-omap2/
H A Dpm34xx.c99f0b8d6 Wed Oct 17 13:07:18 CDT 2012 Tony Lindgren <tony@atomide.com> Merge branch 'omap-for-v3.8/cleanup-headers-gpmc' into omap-for-v3.8/cleanup-headers

Conflicts:
arch/arm/mach-omap2/board-3430sdp.c
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-rx51-peripherals.c
arch/arm/mach-omap2/board-rx51.c
arch/arm/mach-omap2/pm34xx.c
drivers/mtd/nand/omap2.c
drivers/mtd/onenand/omap2.c