Merge branch 'x86/nuke386' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 19 Dec 2012 21:02:23 +0000 (13:02 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 19 Dec 2012 21:02:23 +0000 (13:02 -0800)
commit1bd12c91de35756129b8ffe28a4fe45177b86381
tree4217aef46c19c963b44b202382beeddd3063fa5a
parent3dbff0d5e8ec9e6d0834ea889d496bc724743dfd
parentbc3eba60682750dd7b45ea616d65c926fc3b8be8
Merge branch 'x86/nuke386' of git://git./linux/kernel/git/tip/tip

Pull one final 386 removal patch from Peter Anvin.

IRQ 13 FPU error handling is gone.  That was not one of the proudest
moments in PC history.

* 'x86/nuke386' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, 386 removal: Remove support for IRQ 13 FPU error reporting
arch/x86/kernel/traps.c