From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 17 Jun 2010 20:21:14 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v2.6.36-rc1~571^2~540^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abf52f86aa0a49a7377350cafa8f218c4cd227e7;p=pandora-kernel.git

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

Conflicts:
	net/mac80211/mlme.c
---

abf52f86aa0a49a7377350cafa8f218c4cd227e7
Reading git-diff-tree failed