]> Git Repo - J-linux.git/commitdiff
Merge commit 'origin/master' into next
authorBenjamin Herrenschmidt <[email protected]>
Fri, 26 Feb 2010 03:41:00 +0000 (14:41 +1100)
committerBenjamin Herrenschmidt <[email protected]>
Fri, 26 Feb 2010 03:41:00 +0000 (14:41 +1100)
Manual merge of:
drivers/char/hvc_console.c
drivers/char/hvc_console.h

1  2 
arch/powerpc/Kconfig
arch/powerpc/platforms/85xx/mpc85xx_mds.c
arch/powerpc/platforms/powermac/feature.c

Simple merge
This page took 0.078223 seconds and 4 git commands to generate.