Merge with ../linux-2.6
authorTony Lindgren <tony@atomide.com>
Tue, 6 Sep 2005 10:01:08 +0000 (13:01 +0300)
committerTony Lindgren <tony@atomide.com>
Tue, 6 Sep 2005 10:01:08 +0000 (13:01 +0300)

Trivial merge