Merge with /home/tmlind/src/kernel/linux-2.6
authorTony Lindgren <tony@atomide.com>
Tue, 13 Jun 2006 17:21:48 +0000 (10:21 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 13 Jun 2006 17:21:48 +0000 (10:21 -0700)

Trivial merge