Merge with /home/tmlind/src/kernel/linux-2.6
authorTony Lindgren <tony@atomide.com>
Tue, 17 Jan 2006 18:25:10 +0000 (10:25 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 17 Jan 2006 18:25:10 +0000 (10:25 -0800)

Trivial merge