From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Mon, 6 Feb 2006 12:43:13 +0000 (-0200)
Subject: Merge branch 'origin'
X-Git-Tag: v2.6.16-rc3~135^2~3
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2faf597d93bdf5e2d12d93ea0815935a73f749e;p=linux-2.6

Merge branch 'origin'
---

b2faf597d93bdf5e2d12d93ea0815935a73f749e