| commit | 6c97a189592fadaa928aa3e6c673e061823f1597 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Mon Nov 05 10:28:21 2012 -0800 |
| committer | Olof Johansson <olof@lixom.net> | Mon Nov 05 10:28:21 2012 -0800 |
| tree | 5a3962136d574d05a788f0fbac0f36c528efc699 | |
| parent | 365480d67bfa6a3205708d20035abee4d422ee5b [diff] | |
| parent | 7bd3b61853da6d2fc579e27c7a1ac1e9fc968d1a [diff] |
Merge branch 'depends/omap-cleanup-headers-menelaus' into next/headers Again, resolve conflicts identical to how Tony did. Conflicts: arch/arm/mach-omap2/board-h4.c arch/arm/mach-omap2/board-n8x0.c Signed-off-by: Olof Johansson <olof@lixom.net>