]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
projects / linux-2.6-omap-h63xx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f781b03 0665190)
Merge branch 'linus' into x86/nmi
authorIngo Molnar <mingo@elte.hu>
Mon, 16 Jun 2008 08:17:15 +0000 (10:17 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 16 Jun 2008 08:17:15 +0000 (10:17 +0200)
Conflicts:

arch/x86/kernel/nmi_32.c

1  2 
arch/x86/kernel/traps_32.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/kernel/traps_32.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.