From: Jeff Garzik <jgarzik@pobox.com>
Date: Wed, 18 Jan 2006 00:29:28 +0000 (-0500)
Subject: Merge branch 'upstream'
X-Git-Tag: v2.6.17-rc1~1186^2~82
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef6f63a4aafcf6c79ac371f3c78a96b76c0f0596;p=linux-2.6

Merge branch 'upstream'
---

ef6f63a4aafcf6c79ac371f3c78a96b76c0f0596