tree c3f5bdb06a047eaca8a2e09b6dfd285d0cc26037
parent 4dad99928211a20a91ec4515ab3b53fd65988f34
parent d7660918fce210f421cc58c060ca3de71e4ffd37
author Gustavo F. Padovan <padovan@profusion.mobi> 1324301873 -0200
committer Gustavo F. Padovan <padovan@profusion.mobi> 1324301873 -0200

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

Conflicts:
	net/bluetooth/l2cap_core.c