Merge with /home/tmlind/src/kernel/linux-2.6
authorTony Lindgren <tony@atomide.com>
Wed, 30 Nov 2005 00:48:00 +0000 (16:48 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 30 Nov 2005 00:48:00 +0000 (16:48 -0800)

Trivial merge