From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 15 Dec 2010 21:33:28 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v2.6.38-rc1~476^2~104^2~4^2~46
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1fcfe76a760e78d7774a254608557c84071b0cfb;p=pandora-kernel.git

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

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

1fcfe76a760e78d7774a254608557c84071b0cfb
Reading git-diff-tree failed