]> 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>
Tue, 26 Jul 2011 04:06:46 +0000 (14:06 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 26 Jul 2011 04:06:46 +0000 (14:06 +1000)
1  2 
arch/x86/include/asm/pgtable_types.h
arch/x86/xen/mmu.c

Simple merge
Simple merge