Merge ../linux-2.6
authorTony Lindgren <tony@atomide.com>
Thu, 20 Sep 2007 17:06:48 +0000 (10:06 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 20 Sep 2007 17:06:48 +0000 (10:06 -0700)

Trivial merge