Merge with /home/tmlind/src/kernel/linux-2.6
authorTony Lindgren <tony@atomide.com>
Fri, 22 Dec 2006 00:07:09 +0000 (16:07 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 22 Dec 2006 00:07:09 +0000 (16:07 -0800)

Trivial merge