]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 774bd86 9e8a9bc)
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 patch | diff1 | diff2 | blob | history

diff --cc arch/powerpc/kernel/traps.c
Simple merge
Linux 2.6 source tree