From: Jeff Garzik <jgarzik@pobox.com>
Date: Sun, 30 Oct 2005 09:46:16 +0000 (-0500)
Subject: Merge branch 'upstream'
X-Git-Tag: v2.6.17-rc1~1182^2~130^2~15
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d2927cbe40b29ceda96c7a2412f7daee70026aad;p=karo-tx-linux.git

Merge branch 'upstream'
---

d2927cbe40b29ceda96c7a2412f7daee70026aad