Merge with /home/tmlind/src/kernel/linux-2.6
authorTony Lindgren <tony@atomide.com>
Fri, 12 May 2006 11:38:29 +0000 (04:38 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 12 May 2006 11:38:29 +0000 (04:38 -0700)

Trivial merge