From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Wed, 8 Mar 2006 15:34:10 +0000 (-0300)
Subject: Merge branch 'work-fixes'
X-Git-Tag: v2.6.16-rc6~58^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=155ec9e63da962bf26ffc65a4088c6cc935f28db;p=linux-2.6

Merge branch 'work-fixes'
---

155ec9e63da962bf26ffc65a4088c6cc935f28db