Merge ../linux-2.6
authorJames Bottomley <jejb@mulgrave.il.steeleye.com>
Sat, 10 Jun 2006 18:47:26 +0000 (13:47 -0500)
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>
Sat, 10 Jun 2006 18:47:26 +0000 (13:47 -0500)

Trivial merge