]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kvm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 20 Aug 2012 04:46:05 +0000 (14:46 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 20 Aug 2012 04:46:05 +0000 (14:46 +1000)
commit9d072910e55556bdf7f48f58d810373cc07ad06c
tree48b4e89e846b60a6cb96bb387a55efa293140cd3
parent7ebcc2a97be74c38eace265e2bb8b271df3012d7
parent8fbe6a541f50eeec5e3e49bd92db23ade9496673
Merge remote-tracking branch 'kvm/linux-next'

Conflicts:
arch/s390/include/asm/processor.h
arch/s390/include/asm/processor.h
arch/s390/kernel/dis.c