From: Jeff Garzik <jeff@garzik.org>
Date: Sat, 29 Jul 2006 04:33:35 +0000 (-0400)
Subject: Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville... 
X-Git-Tag: v2.6.19-rc1~1263^2~117
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d2d8259a2a3078c629b6ee9d4a7ae3ef74ac100;p=pandora-kernel.git

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

7d2d8259a2a3078c629b6ee9d4a7ae3ef74ac100
Reading git-diff-tree failed