Merge branch 'master' into for-next
authorNeil Brown <neilb@suse.de>
Fri, 11 Jul 2008 11:57:40 +0000 (21:57 +1000)
committerNeil Brown <neilb@suse.de>
Fri, 11 Jul 2008 11:57:40 +0000 (21:57 +1000)

Trivial merge