Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
commitccc712fe6b2acbafe9fc31f765a193e3249ca4a1
authorGreg Kroah-Hartman <gregkh@suse.de>
Thu, 24 Aug 2006 04:08:12 +0000 (23 21:08 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 24 Aug 2006 04:08:12 +0000 (23 21:08 -0700)
tree9e1a4052a69203baf1e866af4536ca9ceb904fa6
parent9c637646dafd82370c284ce7fcc8b4ba2546dfb1
parentc9169f8747bb282cbe518132bf7d49755a00b6c1
Merge branch 'merge' of git://git./linux/kernel/git/paulus/powerpc
arch/powerpc/kernel/traps.c