From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 24 Aug 2010 20:35:40 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v2.6.37-rc1~147^2~679^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=268bae0b6879f238ba57f5f801958d1254e136f7;p=pandora-kernel.git

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

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

268bae0b6879f238ba57f5f801958d1254e136f7
Reading git-diff-tree failed