From: Jeff Garzik <jgarzik@pobox.com>
Date: Tue, 3 Jan 2006 15:49:18 +0000 (-0500)
Subject: Merge branch 'master'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ac67c6247361b3b8644b34e5301a46d5069c1373;p=linux.git

Merge branch 'master'
---

ac67c6247361b3b8644b34e5301a46d5069c1373