From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 30 May 2011 02:11:50 +0000 (+1000)
Subject: Merge remote-tracking branch 'bluetooth/master'
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f30fd3437652240656f03d1289d5ca5d097a2ef;p=pandora-kernel.git

Merge remote-tracking branch 'bluetooth/master'

Conflicts:
	net/bluetooth/l2cap_core.c
---

0f30fd3437652240656f03d1289d5ca5d097a2ef
Reading git-diff-tree failed