From: Jeff Garzik <jeff@garzik.org>
Date: Wed, 26 Apr 2006 10:18:15 +0000 (-0400)
Subject: Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville... 
X-Git-Tag: v2.6.18-rc1~1115^2~88
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00355cd938bac2a6006efa140352958784431f1f;p=pandora-kernel.git

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

00355cd938bac2a6006efa140352958784431f1f
Reading git-diff-tree failed