]> 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, 6 Dec 2011 02:06:09 +0000 (13:06 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 Dec 2011 02:06:09 +0000 (13:06 +1100)
commited23693bdb2662ab7422b10efab1062be787d445
tree978ff2c5dadff2564776e36d8b0214d02948b053
parent7d6b249ed21e8e1b372c5704bc8286df424749c0
parent54e6a3c0579f6bc6dcf7af57d1439b5b1a29dd07
Merge remote-tracking branch 'xen-two/linux-next'

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