From: Jeff Garzik <jgarzik@pobox.com>
Date: Wed, 14 Dec 2005 03:22:50 +0000 (-0500)
Subject: Merge branch 'upstream'
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=36dfc3f67b3054e6bbc5344256461802aa5d6257;p=linux-beck.git

Merge branch 'upstream'
---

36dfc3f67b3054e6bbc5344256461802aa5d6257