Merge with /home/tmlind/src/kernel/linux-2.6
authorTony Lindgren <tony@atomide.com>
Mon, 16 Jan 2006 22:11:05 +0000 (14:11 -0800)
committerTony Lindgren <tony@atomide.com>
Mon, 16 Jan 2006 22:11:05 +0000 (14:11 -0800)

Trivial merge