| commit | 1e7342e7789fa2ca9202701467428726cbcfd649 | [log] [tgz] |
|---|---|---|
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | Fri Dec 16 11:24:25 2011 +1100 |
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | Fri Dec 16 11:24:25 2011 +1100 |
| tree | e0ad000924e9875bd2ea17bd0e04382491765a09 | |
| parent | 78c5c68a4cf4329d17abfa469345ddf323d4fd62 [diff] | |
| parent | 228d55053397e6d5325ca179c7ffe331de2846d3 [diff] |
Merge remote-tracking branch 'jwb/next' into next Conflicts: arch/powerpc/platforms/40x/ppc40x_simple.c