From: Jeff Garzik <jeff@garzik.org>
Date: Sun, 12 Mar 2006 00:55:37 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Tag: v2.6.17-rc1~1182^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2f7ccc51db9f10ed2eaa4cd1777181972a23754e;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'upstream-fixes'
---

2f7ccc51db9f10ed2eaa4cd1777181972a23754e