Merge with /home/tmlind/src/kernel/linux-2.6
authorTony Lindgren <tony@atomide.com>
Tue, 20 Jun 2006 16:34:48 +0000 (09:34 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 20 Jun 2006 16:34:48 +0000 (09:34 -0700)

Trivial merge