From: Jeff Garzik <jgarzik@pobox.com>
Date: Sun, 4 Dec 2005 01:34:14 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4ef679e6caf1261b6380a610a705a90d7e2738c6;p=linux-beck.git

Merge branch 'upstream-fixes'
---

4ef679e6caf1261b6380a610a705a90d7e2738c6