]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kvm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 17 Aug 2012 03:06:58 +0000 (13:06 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 17 Aug 2012 03:06:58 +0000 (13:06 +1000)
commit6be92265cb57ccf75fd2ab26113e29fa2d63246b
tree1f71bcaf140e04e2095a73dcf41fac8807a6ae7b
parent65fb52e445ffde27ce95497d8bf634a5517831d8
parentdbcb4e798072d114fe68813f39a9efd239ab99c0
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