Merge linux-2.6
authorTony Lindgren <tony@atomide.com>
Mon, 1 Oct 2007 16:36:54 +0000 (09:36 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 1 Oct 2007 16:36:54 +0000 (09:36 -0700)
Merge branches 'master' and 'linus'


Trivial merge