From: David S. Miller <davem@davemloft.net>
Date: Fri, 26 Feb 2010 07:26:21 +0000 (-0800)
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~88
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19bc291c99f018bd4f2c38bbf69144086dca903f;p=pandora-kernel.git

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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-core.h
	drivers/net/wireless/rt2x00/rt2800pci.c
---

19bc291c99f018bd4f2c38bbf69144086dca903f
Reading git-diff-tree failed