Merge with ../linux-2.6
authorTony Lindgren <tony@atomide.com>
Mon, 29 Aug 2005 10:59:42 +0000 (13:59 +0300)
committerTony Lindgren <tony@atomide.com>
Mon, 29 Aug 2005 10:59:42 +0000 (13:59 +0300)

Trivial merge