]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'powerpc/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Oct 2012 00:58:52 +0000 (10:58 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Oct 2012 00:58:52 +0000 (10:58 +1000)
commitc08f4a811dd6330abe479219638d1de6ccab1dc9
tree2f26e0fc4d2c6c82ea7b7a8ad3334ef153412a57
parent1768677fb7a1c9bb2f885fb3676d59a247ff1331
parent7844663a31e97930e3949430573452ac245bfdd5
Merge remote-tracking branch 'powerpc/next'

Conflicts:
drivers/scsi/ipr.c
arch/powerpc/configs/ppc64_defconfig
arch/powerpc/kernel/process.c
arch/powerpc/kernel/prom_init.c
arch/powerpc/kernel/time.c
arch/powerpc/mm/fault.c
drivers/scsi/ipr.c
drivers/tty/hvc/hvc_console.c