From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 6 Jan 2010 22:22:54 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
X-Git-Tag: v2.6.34-rc1~233^2~556^2~131
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cfa6cb2048beb35ae7f1d2fa19160aab240557d1;p=pandora-kernel.git

Merge git://git./linux/kernel/git/linville/wireless-2.6

Conflicts:
	net/mac80211/scan.c
	net/mac80211/wme.c
---

cfa6cb2048beb35ae7f1d2fa19160aab240557d1
Reading git-diff-tree failed