From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 16 May 2011 18:55:42 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.0-rc1~377^2~54^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e00cf3b9eb7839b952e434a75bff6b99e47337ac;p=pandora-kernel.git

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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn-tx.c
	net/mac80211/sta_info.h
---

e00cf3b9eb7839b952e434a75bff6b99e47337ac
Reading git-diff-tree failed