From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 18 Feb 2011 22:03:41 +0000 (-0500)
Subject: Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
X-Git-Tag: v2.6.39-rc1~468^2~238^2^2~29
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b67afe7f43afd2f5cd98798993561920c1684c12;p=pandora-kernel.git

Merge ssh:///linux/kernel/git/linville/wireless-2.6

Conflicts:
	drivers/bluetooth/ath3k.c
	drivers/bluetooth/btusb.c
---

b67afe7f43afd2f5cd98798993561920c1684c12
Reading git-diff-tree failed