Merge with ../linux-2.6
authorTony Lindgren <tony@atomide.com>
Thu, 11 Aug 2005 07:26:52 +0000 (00:26 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 11 Aug 2005 07:26:52 +0000 (00:26 -0700)

Trivial merge