From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Tue, 31 Jan 2006 20:49:28 +0000 (-0200)
Subject: Merge branch 'origin'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=638e174688f58200d0deb7435093435e7d737b09;p=linux.git

Merge branch 'origin'
---

638e174688f58200d0deb7435093435e7d737b09