Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
authorGreg Kroah-Hartman <gregkh@suse.de>
Fri, 18 Aug 2006 16:20:04 +0000 (09:20 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 18 Aug 2006 16:20:04 +0000 (09:20 -0700)
commited0da6fc9d3096f54c4a76737eeae57ac81418cf
tree3bf45a192d991c5a5c80ac86eb333f9a4f796044
parent774bd8613d0188cda72408f8ffce258d73953cad
parent9e8a9bc2d2c3ac3b8542cc5c2544248df6f3f1c5
Merge branch 'merge' of git://git./linux/kernel/git/paulus/powerpc
arch/powerpc/kernel/traps.c