Merge with /home/tmlind/src/kernel/linux-2.6
authorTony Lindgren <tony@atomide.com>
Tue, 7 Feb 2006 03:36:15 +0000 (19:36 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 7 Feb 2006 03:36:15 +0000 (19:36 -0800)

Trivial merge