Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab...
authorMauro Carvalho Chehab <mchehab@infradead.org>
Mon, 16 Jan 2006 10:39:30 +0000 (08:39 -0200)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Mon, 16 Jan 2006 10:39:30 +0000 (08:39 -0200)

Trivial merge