From: Jeff Garzik <jeff@garzik.org>
Date: Sat, 23 Sep 2006 00:10:23 +0000 (-0400)
Subject: Merge branch 'master' into upstream
X-Git-Tag: v2.6.19-rc1~1263^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28eb177dfa5982d132edceed891cb3885df258bb;p=pandora-kernel.git

Merge branch 'master' into upstream

Conflicts:

	net/ieee80211/ieee80211_crypt_tkip.c
	net/ieee80211/ieee80211_crypt_wep.c
---

28eb177dfa5982d132edceed891cb3885df258bb
Reading git-diff-tree failed