| commit | 46cddc01aa6a017193ae7320ef8bfc8242782a66 | [log] [tgz] |
|---|---|---|
| author | Tony Lindgren <tony@atomide.com> | Wed Oct 17 11:13:42 2012 -0700 |
| committer | Tony Lindgren <tony@atomide.com> | Wed Oct 17 11:13:42 2012 -0700 |
| tree | da67a2fb45e512689bf909b4f832a8daea57e140 | |
| parent | 99f0b8d6b09b0db6452d0d6e252bfa28049bbea9 [diff] | |
| parent | 53db20d123f7a1bf44e46b727775403672655fde [diff] |
Merge branch 'omap-for-v3.8/cleanup-headers-mmc' into omap-for-v3.8/cleanup-headers Conflicts: arch/arm/mach-omap1/devices.c arch/arm/mach-omap2/omap_hwmod_33xx_data.c arch/arm/mach-omap2/omap_hwmod_3xxx_data.c drivers/mmc/host/omap.c