]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'xen/upstream/xen'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 2 Dec 2011 02:04:01 +0000 (13:04 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 2 Dec 2011 02:04:01 +0000 (13:04 +1100)
commite7d0551f872aa788779b2c97556ec0078695eb35
treed9e94195402dbe0cafc676c690aeff4306f5fed6
parente89bbf7ebf3978a2687e0c208e043f6e25a920ba
parentec8161f0607c014eb27e65340edcda7edebb545a
Merge remote-tracking branch 'xen/upstream/xen'

Conflicts:
arch/x86/xen/Kconfig
arch/x86/kernel/Makefile
arch/x86/kernel/microcode_core.c
arch/x86/xen/Kconfig