| commit | 1ad920556f32a5a127397ca461d1a1faaf22c4e0 | [log] [tgz] |
|---|---|---|
| author | Tony Lindgren <tony@atomide.com> | Sun Jul 10 11:48:26 2011 -0700 |
| committer | Tony Lindgren <tony@atomide.com> | Sun Jul 10 11:48:26 2011 -0700 |
| tree | cea7ef733c50025496f554f114173e49e52d3028 | |
| parent | f67df6c670a8fcd3f63728afa2314e7eca653bd7 [diff] | |
| parent | 727e18b429e3badda12d1de74f492bfa363a2e94 [diff] |
Merge branch 'cleanup-part-2' into devel-board Conflicts: arch/arm/mach-omap2/board-4430sdp.c arch/arm/mach-omap2/board-rx51-peripherals.c