Merge ../linux-2.6
authorTony Lindgren <tony@atomide.com>
Tue, 3 Jan 2006 19:27:39 +0000 (11:27 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 3 Jan 2006 19:27:39 +0000 (11:27 -0800)

Trivial merge