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

Simple merge