From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Tue, 24 May 2011 07:06:26 +0000 (-0700)
Subject: Merge branch 'next' into for-linus
X-Git-Tag: v3.0-rc1~314^2
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=b73077eb03f510a84b102fb97640e595a958403c;p=jlayton%2Flinux.git

Merge branch 'next' into for-linus
---

b73077eb03f510a84b102fb97640e595a958403c