Merge ../linux-2.6
authorJames Bottomley <jejb@mulgrave.il.steeleye.com>
Mon, 28 Aug 2006 02:59:59 +0000 (21:59 -0500)
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>
Mon, 28 Aug 2006 02:59:59 +0000 (21:59 -0500)

Trivial merge