]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'omap-for-v3.8/cleanup-headers-gpmc' into omap-for-v3.8/cleanup-headers
authorTony Lindgren <tony@atomide.com>
Wed, 17 Oct 2012 18:07:18 +0000 (11:07 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 17 Oct 2012 18:07:18 +0000 (11:07 -0700)
commit16fea2d7f1e4f5533e0e615ed7b11e70d2abf26d
tree23db2359ad86957359da7c8a458e25eddb08d776
parente2709ed9f80f5cf4ca859fe0f0929bfe308076ca
parentc24dae9b222e3ce18b12cc34af37ec7ae7b89801
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
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