From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 12 Apr 2012 18:25:14 +0000 (-0400)
Subject: Merge branch 'master' into for-davem
X-Git-Tag: v3.5-rc1~109^2~487^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7eab0f64a9eba5405222fdef0ede2468bf495efd;p=pandora-kernel.git

Merge branch 'master' into for-davem

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

7eab0f64a9eba5405222fdef0ede2468bf495efd
Reading git-diff-tree failed