From: Jeff Garzik <jgarzik@pobox.com>
Date: Sun, 20 Nov 2005 05:41:18 +0000 (-0500)
Subject: Merge branch 'upstream'
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=98a5d024eb589a863c1c79f3c3f8ecb666c0eec9;p=linux-beck.git

Merge branch 'upstream'
---

98a5d024eb589a863c1c79f3c3f8ecb666c0eec9