diff options
author | Tony Lindgren <tony@atomide.com> | 2012-10-17 11:07:18 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-10-17 11:07:18 -0700 |
commit | 99f0b8d6b09b0db6452d0d6e252bfa28049bbea9 (patch) | |
tree | 23db2359ad86957359da7c8a458e25eddb08d776 /drivers/mmc/host | |
parent | 94c657853bd228ebbc2c590b7f81efcc1dde3329 (diff) | |
parent | 94709014ea8d2f24fbc1e6eb6982e801e325bd47 (diff) | |
download | linux-99f0b8d6b09b0db6452d0d6e252bfa28049bbea9.tar.gz linux-99f0b8d6b09b0db6452d0d6e252bfa28049bbea9.tar.bz2 linux-99f0b8d6b09b0db6452d0d6e252bfa28049bbea9.zip |
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
Diffstat (limited to 'drivers/mmc/host')
0 files changed, 0 insertions, 0 deletions