Merge with ../linux-2.6
authorTony Lindgren <tony@atomide.com>
Fri, 2 Dec 2005 00:45:40 +0000 (16:45 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 2 Dec 2005 00:45:40 +0000 (16:45 -0800)

Trivial merge