From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 6 Jun 2012 18:40:06 +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~559^2~54
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c9c46c16d2d1d232f3296924162de293477f017;p=pandora-kernel.git

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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-drv.c
---

7c9c46c16d2d1d232f3296924162de293477f017
Reading git-diff-tree failed