]> 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)
commit314f53708ae6385163296aa4c648d538833dde7c
tree23db2359ad86957359da7c8a458e25eddb08d776
parent7e2f587448fb2ef0ed85f0f2898a2ad9a08a6e48
parent0ae8ea02689b9e284b616695a1f3caaf7a544591
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