From: Jeff Garzik <jeff@garzik.org>
Date: Mon, 4 Sep 2006 10:42:01 +0000 (-0400)
Subject: Merge branch 'upstream' into pata-drivers
X-Git-Tag: v2.6.19-rc1~1262^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fc851fad00d7fa1bf4ac7034d9ba8041bf482d50;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'upstream' into pata-drivers
---

fc851fad00d7fa1bf4ac7034d9ba8041bf482d50