From: Jeff Garzik <jeff@garzik.org>
Date: Thu, 7 Dec 2006 10:02:40 +0000 (-0500)
Subject: Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville... 
X-Git-Tag: v2.6.20-rc1~145^2^2~6^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=359f2d17e32b32f53577375f83fb06d34e31bfe8;p=pandora-kernel.git

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

Conflicts:

	drivers/net/wireless/zd1211rw/zd_mac.h
	net/ieee80211/softmac/ieee80211softmac_assoc.c
---

359f2d17e32b32f53577375f83fb06d34e31bfe8
Reading git-diff-tree failed