From: David S. Miller <davem@davemloft.net>
Date: Wed, 23 Sep 2009 23:23:46 +0000 (-0700)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v2.6.32-rc1~27^2~11
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=139d6065c83071d5f66cd013a274a43699f8e2c1;p=pandora-kernel.git

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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-rx.c
---

139d6065c83071d5f66cd013a274a43699f8e2c1
Reading git-diff-tree failed