]> 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, 12 Aug 2011 03:34:53 +0000 (13:34 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 12 Aug 2011 03:34:53 +0000 (13:34 +1000)
commit859b5e7d358547e87b1eaef3fd65cfd8fc64f26a
tree86ff614b086bb3353b139e9412011a6e6df3bbaa
parentc070fa4b6fdef2095a354ecace87d2bf560e231d
parent09b15c5917a6438307f29dbf0d7a708e869b0710
Merge remote-tracking branch 'xen/upstream/xen'

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