Merge with ../linux-2.6
authorTony Lindgren <tony@atomide.com>
Tue, 9 Aug 2005 08:09:27 +0000 (01:09 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 9 Aug 2005 08:09:27 +0000 (01:09 -0700)

Trivial merge