From: Jeff Garzik <jeff@garzik.org>
Date: Thu, 20 Apr 2006 21:36:10 +0000 (-0400)
Subject: Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... 
X-Git-Tag: v2.6.17-rc3~57^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f18b95c3e2ab0f75b23a5aabab0bc8f99bd6bbf3;p=pandora-kernel.git

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

f18b95c3e2ab0f75b23a5aabab0bc8f99bd6bbf3
Reading git-diff-tree failed