| commit | 874f2f997dbe041a6c6e509dae8656ed9022d65d | |
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | |
| Fri, 26 Feb 2010 03:41:00 +0000 (26 14:41 +1100) | ||
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | |
| Fri, 26 Feb 2010 03:41:00 +0000 (26 14:41 +1100) | ||
| tree | 61898165882041ef7f9beaf2ef6663a1a4d3c29a | treesnapshot (tar.gz zip) |
| parent | 071c06cb570d38efe23a124e885f2f3e643a9206 | commitdiff |
| parent | 6ebdc661b608671e9ca572af8bb42d58108cc008 | commitdiff |
Merge commit 'origin/master' into next
Manual merge of:
drivers/char/hvc_console.c
drivers/char/hvc_console.h
Manual merge of:
drivers/char/hvc_console.c
drivers/char/hvc_console.h
| arch/powerpc/Kconfig | diff1 | diff2 | blobhistory |
| arch/powerpc/platforms/85xx/mpc85xx_mds.c | diff1 | diff2 | blobhistory |
| arch/powerpc/platforms/powermac/feature.c | diff1 | diff2 | blobhistory |