]> git.hungrycats.org Git - linux/commitdiff
projects / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 641108c a5a9e7c)
Merge commit 'v3.4.42' into zygo-3.4.42-zb64 zygo-3.4.42-zb64
authorZygo Blaxell <zblaxell@serenity.furryterror.org>
Sat, 27 Apr 2013 15:21:00 +0000 (11:21 -0400)
committerZygo Blaxell <zblaxell@serenity.furryterror.org>
Sat, 27 Apr 2013 15:21:00 +0000 (11:21 -0400)
1  2 
Makefile patch | diff1 | diff2 | blob | history
net/bluetooth/sco.c patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge
diff --cc net/bluetooth/sco.c
Simple merge
Linux kernels and configurations used by Zygo.