Merge 2.6.23
authorTony Lindgren <tony@atomide.com>
Tue, 9 Oct 2007 22:07:44 +0000 (15:07 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 9 Oct 2007 22:07:44 +0000 (15:07 -0700)
Merge branches 'master' and 'linus'


Trivial merge