diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-17 20:13:42 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-17 20:13:42 +0200 |
| commit | 46cddc01aa6a017193ae7320ef8bfc8242782a66 (patch) | |
| tree | da67a2fb45e512689bf909b4f832a8daea57e140 /arch/arm/mach-ks8695 | |
| parent | Merge branch 'omap-for-v3.8/cleanup-headers-gpmc' into omap-for-v3.8/cleanup-... (diff) | |
| parent | mmc: omap: Remove cpu_is_omap usage from the driver (diff) | |
| download | linux-46cddc01aa6a017193ae7320ef8bfc8242782a66.tar.xz linux-46cddc01aa6a017193ae7320ef8bfc8242782a66.zip | |
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
Diffstat (limited to 'arch/arm/mach-ks8695')
0 files changed, 0 insertions, 0 deletions