Merge ../linux-2.6
authorTony Lindgren <tony@atomide.com>
Fri, 17 Nov 2006 22:40:31 +0000 (00:40 +0200)
committerTony Lindgren <tony@atomide.com>
Fri, 17 Nov 2006 22:40:31 +0000 (00:40 +0200)

Trivial merge