From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Wed, 18 Sep 2013 14:58:33 +0000 (-0700)
Subject: Merge tag 'v3.11' into next
X-Git-Tag: v3.13-rc1~65^2^2~45
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=4ba25a496f62129a2ad8c2436ab2b402752dc66c

Merge tag 'v3.11' into next

Merge with mainline to bring in sync changes to cyttsp4 driver.
---

4ba25a496f62129a2ad8c2436ab2b402752dc66c