| commit | 2da8a79f7d81853d00b6a00621aeef7545196084 | [log] [tgz] |
|---|---|---|
| author | Tony Lindgren <tony@atomide.com> | Thu Oct 25 12:21:48 2012 -0700 |
| committer | Tony Lindgren <tony@atomide.com> | Thu Oct 25 12:21:48 2012 -0700 |
| tree | 5a3962136d574d05a788f0fbac0f36c528efc699 | |
| parent | 6d02643d64b4440394ee462ea4b870c8506cd9e7 [diff] | |
| parent | 7bd3b61853da6d2fc579e27c7a1ac1e9fc968d1a [diff] |
Merge branch 'omap-for-v3.8/cleanup-headers-menelaus' into omap-for-v3.8/cleanup-headers Conflicts: arch/arm/mach-omap2/board-h4.c arch/arm/mach-omap2/board-n8x0.c