Merge with ../linux-2.6
authorTony Lindgren <tony@atomide.com>
Tue, 8 Nov 2005 18:41:02 +0000 (10:41 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 8 Nov 2005 18:41:02 +0000 (10:41 -0800)

Trivial merge