diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-05-10 09:39:05 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-05-10 09:39:05 -0700 |
| commit | 640ec79d6d8c10ceb254c269a1f7fd9cb47ea655 (patch) | |
| tree | e13bf414bc1a9c2e35889441b93443865e2eb14c /arch/arm/mach-omap2/hsmmc.c | |
| parent | 7a8bcf067d2b11964cb83ce3d753ac2d3ab9843c (diff) | |
| parent | cf563a35888ee92361c324dfc57b328c84653c5b (diff) | |
Merge branch 'cleanup-soc' into cleanup
Conflicts:
arch/arm/mach-omap2/Makefile
Diffstat (limited to 'arch/arm/mach-omap2/hsmmc.c')
0 files changed, 0 insertions, 0 deletions