From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 26 Apr 2012 19:03:48 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.5-rc1~109^2~267^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9b8ae6bd8c3304569a25079fcdbebaa28a48ee4;p=pandora-kernel.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem

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

d9b8ae6bd8c3304569a25079fcdbebaa28a48ee4
Reading git-diff-tree failed