]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'xen/upstream/xen'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 04:48:48 +0000 (15:48 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 04:48:48 +0000 (15:48 +1100)
1  2 
arch/x86/kernel/Makefile
arch/x86/xen/time.c

Simple merge
Simple merge