Merge with /home/tmlind/src/kernel/linux-2.6
authorTony Lindgren <tony@atomide.com>
Mon, 13 Feb 2006 17:26:23 +0000 (09:26 -0800)
committerTony Lindgren <tony@atomide.com>
Mon, 13 Feb 2006 17:26:23 +0000 (09:26 -0800)

Trivial merge