Merge tag 'v3.0.75' into zygo-3.0.75-zb64

author Zygo Blaxell <zblaxell@river.furryterror.org>

Sat, 27 Apr 2013 15:21:52 +0000 (11:21 -0400)

committer Zygo Blaxell <zblaxell@river.furryterror.org>

Sat, 27 Apr 2013 15:21:52 +0000 (11:21 -0400)
author Zygo Blaxell <zblaxell@river.furryterror.org>
Sat, 27 Apr 2013 15:21:52 +0000 (11:21 -0400)
committer Zygo Blaxell <zblaxell@river.furryterror.org>
Sat, 27 Apr 2013 15:21:52 +0000 (11:21 -0400)
diff --cc Makefile
Simple merge
diff --cc net/bluetooth/sco.c
Simple merge
author	Zygo Blaxell <zblaxell@river.furryterror.org>
	Sat, 27 Apr 2013 15:21:52 +0000 (11:21 -0400)
committer	Zygo Blaxell <zblaxell@river.furryterror.org>
	Sat, 27 Apr 2013 15:21:52 +0000 (11:21 -0400)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
net/bluetooth/sco.c	patch \|	diff1 \|	diff2 \|	blob \| history