From: Jeff Garzik <jgarzik@pobox.com>
Date: Sun, 29 Jan 2006 17:41:09 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Tag: v2.6.17-rc1~1182^2~103
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6fb89bf6b8b45ec8c911570ba0852940690d846;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'upstream-fixes'
---

d6fb89bf6b8b45ec8c911570ba0852940690d846