From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 13 Jun 2012 19:35:35 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
X-Git-Tag: v3.6-rc1~125^2~57^2~289
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=211c17aaee644bb808fbdeef547ac99db92c01ed;p=pandora-kernel.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless

Conflicts:
	drivers/net/wireless/ath/ath9k/main.c
	net/bluetooth/hci_event.c
---

211c17aaee644bb808fbdeef547ac99db92c01ed
Reading git-diff-tree failed