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)
commit28638ea4f8adb63f837e4436560ab16ab0388587
tree2dab7a03d7696697c82ba62a03700d3a2f3639b1
parentf781b03c4b1c713ac000877c8bbc31fc4164a29b
parent066519068ad2fbe98c7f45552b1f592903a9c8c8
Merge branch 'linus' into x86/nmi

Conflicts:

arch/x86/kernel/nmi_32.c
arch/x86/kernel/traps_32.c