tree fd006445c562749de9a07fe6e5363bab5d285a20
parent 26954c7f26068b6ced108806fdd39aee5cd54e6f
parent 069f40fc07f6df3da325e7ea1698a0d6247983d5
author Gustavo F. Padovan <padovan@profusion.mobi> 1303346827 -0300
committer Gustavo F. Padovan <padovan@profusion.mobi> 1303346827 -0300

Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6

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