9ed4a88daf057b8dbe80c220de
parent 330605423ca6eafafb8dcc27502bce1c585d1b06
author Gustavo F. Padovan <padovan@profusion.mobi> 1308678776 -0300
committer Gustavo F. Padovan <padovan@profusion.mobi> 1308678776 -0300

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

Conflicts:
	net/bluetooth/l2cap_core.c
¬Ô~9™