]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'xen-two/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 01:50:27 +0000 (11:50 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 01:50:27 +0000 (11:50 +1000)
1  2 
arch/x86/xen/enlighten.c

Simple merge