projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 78b89ec ce2eef3)
Merge branch 'bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen...
authorIngo Molnar <[email protected]>
Thu, 20 Aug 2009 10:05:24 +0000 (12:05 +0200)
committerIngo Molnar <[email protected]>
Thu, 20 Aug 2009 10:05:24 +0000 (12:05 +0200)
1  2 
arch/x86/kernel/cpu/Makefile patch | diff1 | diff2 | blob | history
arch/x86/xen/Makefile patch | diff1 | diff2 | blob | history
arch/x86/xen/enlighten.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/kernel/cpu/Makefile
Simple merge
diff --cc arch/x86/xen/Makefile
Simple merge
diff --cc arch/x86/xen/enlighten.c
Simple merge
John Crispins staging tree