From: Jeff Garzik <jeff@garzik.org>
Date: Tue, 4 Apr 2006 12:45:13 +0000 (-0400)
Subject: Merge branch 'upstream'
X-Git-Tag: v2.6.18-rc1~1079^2~98^2~13^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=79fa1b677be3a985cc66b9218a4dd09818f1051b;p=karo-tx-linux.git

Merge branch 'upstream'
---

79fa1b677be3a985cc66b9218a4dd09818f1051b