From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Sun, 15 Jan 2006 22:59:29 +0000 (-0200)
Subject: Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.16-rc1~34^2^2~2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1dccedc8148026d9071c6805f7cb77374a9e56f;p=linux-2.6

Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
---

f1dccedc8148026d9071c6805f7cb77374a9e56f