Merge with /home/tmlind/src/kernel/linux-2.6
authorTony Lindgren <tony@atomide.com>
Tue, 15 Nov 2005 21:10:54 +0000 (13:10 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 15 Nov 2005 21:10:54 +0000 (13:10 -0800)

Trivial merge