Merge with ../linux-2.6
authorTony Lindgren <tony@atomide.com>
Thu, 10 Nov 2005 01:24:02 +0000 (17:24 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 10 Nov 2005 01:24:02 +0000 (17:24 -0800)

Trivial merge