| commit | d702d12167a2c05a346f49aac7a311d597762495 | [log] [tgz] |
|---|---|---|
| author | Tony Lindgren <tony@atomide.com> | Mon Mar 01 14:19:05 2010 -0800 |
| committer | Tony Lindgren <tony@atomide.com> | Mon Mar 01 14:19:05 2010 -0800 |
| tree | baae42c299cce34d6df24b5d01f8b1d0b481bd9a | |
| parent | 9418c65f9bd861d0f7e39aab9cfb3aa6f2275d11 [diff] | |
| parent | ac0f6f927db539e03e1f3f61bcd4ed57d5cde7a9 [diff] |
Merge with mainline to remove plat-omap/Kconfig conflict Conflicts: arch/arm/plat-omap/Kconfig