tree 095d936b751b0a92946fcf710fb74dea7f8f33f7
parent 5e819059a20b0fc5a71875f28b4cae359e38d85a
parent 2aeabcbedd51aef94b61d05b57246d1db4984453
author John W. Linville <linville@tuxdriver.com> 1320868473 -0500
committer John W. Linville <linville@tuxdriver.com> 1320868473 -0500

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next

Conflicts:
	net/bluetooth/l2cap_sock.c
	net/bluetooth/mgmt.c