Merge with /home/tmlind/src/kernel/linux-2.6
authorTony Lindgren <tony@atomide.com>
Tue, 4 Apr 2006 15:30:26 +0000 (08:30 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 4 Apr 2006 15:30:26 +0000 (08:30 -0700)

Trivial merge