]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
authorGreg Kroah-Hartman <gregkh@suse.de>
Thu, 24 Aug 2006 04:08:12 +0000 (21:08 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 24 Aug 2006 04:08:12 +0000 (21:08 -0700)
1  2 
arch/powerpc/kernel/traps.c

Simple merge