]> 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>
Mon, 12 Dec 2011 03:05:37 +0000 (14:05 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Dec 2011 03:05:37 +0000 (14:05 +1100)
commitc3990a80bedd05b5bfc8565621e14e991cba832e
treec968945144f333068548bc5fe907d2a6508aa440
parentad9b4293f1d75960e9f5b210b5108d975b391342
parent54e6a3c0579f6bc6dcf7af57d1439b5b1a29dd07
Merge remote-tracking branch 'xen-two/linux-next'

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