projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 68c6beb 3b1bace)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 21 Nov 2013 15:26:17 +0000 (10:26 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 21 Nov 2013 15:26:17 +0000 (10:26 -0500)
1  2 
drivers/net/wireless/brcm80211/brcmfmac/p2p.c patch | diff1 | diff2 | blob | history
net/bluetooth/rfcomm/sock.c patch | diff1 | diff2 | blob | history

diff --cc net/bluetooth/rfcomm/sock.c
Simple merge
Domain: System / Kernel;