Merge ../linux-2.6
authorTony Lindgren <tony@atomide.com>
Sat, 11 Nov 2006 00:21:32 +0000 (02:21 +0200)
committerTony Lindgren <tony@atomide.com>
Sat, 11 Nov 2006 00:21:32 +0000 (02:21 +0200)

Trivial merge