Merge ../linux-2.6
authorMauro Carvalho Chehab <mchehab@infradead.org>
Sun, 27 Jul 2008 21:11:53 +0000 (18:11 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Sun, 27 Jul 2008 21:11:53 +0000 (18:11 -0300)

Trivial merge