]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'xen/upstream/xen'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 26 Sep 2011 06:14:56 +0000 (16:14 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 26 Sep 2011 06:14:56 +0000 (16:14 +1000)
1  2 
arch/x86/xen/time.c

Simple merge