Merge with ../linux-2.6
authorTony Lindgren <tony@atomide.com>
Wed, 24 Aug 2005 11:42:57 +0000 (14:42 +0300)
committerTony Lindgren <tony@atomide.com>
Wed, 24 Aug 2005 11:42:57 +0000 (14:42 +0300)

Trivial merge