]> 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, 19 Aug 2011 02:03:50 +0000 (12:03 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 19 Aug 2011 02:03:50 +0000 (12:03 +1000)
commit5ad93a387fcc22492d79d8a30d6acc96e2ba7400
treee96e4b4e734d173b88356bce95e3c3c4aed23f1f
parent2afc92fc7690d7867f11bbd7a45ae2b6ca582bda
parent09b15c5917a6438307f29dbf0d7a708e869b0710
Merge remote-tracking branch 'xen/upstream/xen'

Conflicts:
arch/x86/xen/Makefile
arch/x86/xen/Makefile