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

Trivial merge