]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c12ae95 e6d4a76)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Nov 2010 23:35:53 +0000 (08:35 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Nov 2010 23:35:53 +0000 (08:35 +0900)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen: remove duplicated #include
  xen: x86/32: perform initial startup on initial_page_table

1  2 
arch/x86/xen/enlighten.c patch | diff1 | diff2 | blob | history
arch/x86/xen/mmu.c patch | diff1 | diff2 | blob | history
arch/x86/xen/setup.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/xen/enlighten.c
Simple merge
diff --cc arch/x86/xen/mmu.c
Simple merge
diff --cc arch/x86/xen/setup.c
Simple merge
Linux kernel for KaRo TX COM modules