]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'xen-two/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Dec 2011 06:23:55 +0000 (17:23 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Dec 2011 06:23:55 +0000 (17:23 +1100)
commite43b2976e4733c8ffec9b471b56b79e28d30b8f2
treeceaeb7e31b17c6b4ef3639c89704006a48e3c76c
parent5892f8e5a7ec2efdbf682d50c393afedada913cd
parentebde9b516a043da816dd26bad31208ea58de3713
Merge remote-tracking branch 'xen-two/linux-next'

Conflicts:
arch/x86/xen/Kconfig
arch/x86/xen/Kconfig