Merge with /home/tmlind/src/kernel/linux-2.6
authorTony Lindgren <tony@atomide.com>
Fri, 18 Nov 2005 00:52:52 +0000 (16:52 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 18 Nov 2005 00:52:52 +0000 (16:52 -0800)

Trivial merge