Merge ../linux-2.6
authorMauro Carvalho Chehab <mchehab@infradead.org>
Mon, 28 Jul 2008 01:23:18 +0000 (22:23 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Mon, 28 Jul 2008 01:23:18 +0000 (22:23 -0300)

Trivial merge