From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 7 Jun 2010 19:13:46 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v2.6.36-rc1~571^2~615^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d88477c41904127ab9ae1f3b5b4a39bf6474043;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
---

9d88477c41904127ab9ae1f3b5b4a39bf6474043
Reading git-diff-tree failed