Merge with /home/tmlind/src/kernel/linux-2.6
authorTony Lindgren <tony@atomide.com>
Fri, 28 Apr 2006 07:28:12 +0000 (00:28 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 28 Apr 2006 07:28:12 +0000 (00:28 -0700)

Trivial merge