Merged with ../linux-2.6
authorTony Lindgren <tony@atomide.com>
Wed, 29 Jun 2005 14:01:46 +0000 (07:01 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 29 Jun 2005 14:01:46 +0000 (07:01 -0700)

Trivial merge