]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a1d5a86 543cf4c)
Merge branch 'linus' into x86/fixmap
authorIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:30:21 +0000 (12:30 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:30:21 +0000 (12:30 +0200)
1  2 
arch/x86/xen/enlighten.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/xen/enlighten.c
Simple merge
Linux 2.6 source tree