From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 26 Feb 2010 21:54:45 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v2.6.34-rc1~233^2~49^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64463da913bc8f791980ba28d93ac5e716ab9cc5;p=pandora-kernel.git

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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-core.h
	net/mac80211/rate.c
---

64463da913bc8f791980ba28d93ac5e716ab9cc5
Reading git-diff-tree failed