]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'xen-two/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Nov 2011 02:35:07 +0000 (13:35 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Nov 2011 02:35:07 +0000 (13:35 +1100)
commit35d4be055df89971b373576365e1d4003de9cc0a
tree41a278dce12eb17bc07284bbe9652f6f310dabb4
parente96b16277c8434a44b0b1755f15ebf4b90fc54cd
parent306e4b3066e1ace0264beb96e850b3772c7c2876
Merge remote-tracking branch 'xen-two/linux-next'

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