Merge commit 'linus/master' into HEAD
authorVegard Nossum <vegard.nossum@gmail.com>
Mon, 15 Jun 2009 13:50:49 +0000 (15:50 +0200)
committerVegard Nossum <vegard.nossum@gmail.com>
Mon, 15 Jun 2009 13:50:49 +0000 (15:50 +0200)
Conflicts:
MAINTAINERS

Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>

Trivial merge