Merged with ../linux-2.6
authorTony Lindgren <tony@atomide.com>
Mon, 20 Jun 2005 20:58:12 +0000 (13:58 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 20 Jun 2005 20:58:12 +0000 (13:58 -0700)

Trivial merge