git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b9818c3 689dfa8)
Merge branch 'merge' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 29 Jan 2013 00:33:37 +0000 (11:33 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 29 Jan 2013 00:33:37 +0000 (11:33 +1100)
Merge "merge" branch to bring in various bug fixes that are
going into 3.8

1  2 
arch/powerpc/kernel/entry_64.S patch | diff1 | diff2 | blob | history
arch/powerpc/kernel/kgdb.c patch | diff1 | diff2 | blob | history

diff --cc arch/powerpc/kernel/entry_64.S
Simple merge
diff --cc arch/powerpc/kernel/kgdb.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.