Merge with /home/tmlind/src/kernel/linux-2.6
authorTony Lindgren <tony@atomide.com>
Thu, 19 Jan 2006 19:10:20 +0000 (11:10 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 19 Jan 2006 19:10:20 +0000 (11:10 -0800)

Trivial merge