Merge ../linux-2.6
authorMauro Carvalho Chehab <mchehab@infradead.org>
Wed, 23 Jul 2008 17:10:23 +0000 (14:10 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Wed, 23 Jul 2008 17:10:23 +0000 (14:10 -0300)

Trivial merge