From: Jeff Garzik <jeff@garzik.org>
Date: Mon, 3 Apr 2006 00:41:48 +0000 (-0400)
Subject: Merge branch 'upstream'
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7819d64e31a685e35e4819515c84168d0879816e;p=linux-beck.git

Merge branch 'upstream'
---

7819d64e31a685e35e4819515c84168d0879816e