Merge branch 'devel' into linux-next
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Fri, 4 Dec 2009 02:27:36 +0000 (21:27 -0500)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Fri, 4 Dec 2009 02:27:36 +0000 (21:27 -0500)

Trivial merge