Merge with ../linux-2.6
authorTony Lindgren <tony@atomide.com>
Thu, 11 Aug 2005 09:49:41 +0000 (02:49 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 11 Aug 2005 09:49:41 +0000 (02:49 -0700)

Trivial merge