]> git.karo-electronics.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>
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)
1  2 
arch/powerpc/kernel/traps.c

Simple merge