Merge branch 'master' into aufs3.x-rcN/10static
Merge branch 'aufs3.x-rcN/10static' into aufs3.x-rcN/11proc_map
Merge branch 'aufs3.x-rcN/11proc_map' into aufs3.x-rcN/18public
Merge branch 'master' into aufs3.x-rcN/10static
Merge branch 'aufs3.x-rcN/10static' into aufs3.x-rcN/11proc_map
Merge branch 'aufs3.x-rcN/11proc_map' into aufs3.x-rcN/18public
Merge branch 'master' into aufs3.x-rcN/10static
Merge branch 'aufs3.x-rcN/10static' into aufs3.x-rcN/11proc_map
Merge branch 'aufs3.x-rcN/11proc_map' into aufs3.x-rcN/18public
Merge tag 'v3.14' of /src/linux/linux into aufs3.14/10static

Linux 3.14
aufs: version string for 3.14

Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>
Revert "aufs: version string for 3.14"

This reverts commit aa8cd81c50b2efe8c91b71e75dc7c87b2ec089d8.
Merge remote-tracking branch 'aufs3-standalone/aufs3.14/00base' into aufs3.14/10static
Merge branch 'aufs3.14/10static' into aufs3.14/11proc_map
Merge remote-tracking branch 'aufs3-standalone/aufs3.x-rcN/00base' into aufs3.x-rcN/10static
Merge branch 'aufs3.x-rcN/10static' into aufs3.x-rcN/11proc_map
Merge branch 'aufs3.x-rcN/11proc_map' into aufs3.x-rcN/18public
HID: sony: Fix cancel_work_sync mismerge

Remove redundant cancel_work_sync() call caused by mismerge.

Signed-off-by: Frank Praznik <frank.praznik@oh.rr.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
parisc: Replace __get_cpu_var uses for address calculation

Convert to the use of this_cpu_ptr().

Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Helge Deller <deller@gmx.de>
Cc: linux-parisc@vger.kernel.org
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Helge Deller <deller@gmx.de>
HID: sensor-hub: add sensor hub quirk for ThinkPad Helix

Just like some of the other laptops/tablets on the market with ultrabook
sensors, the ThinkPad Helix's sensor hub requires a special quirk in
order for it to power on properly. Without it the sensors are detected
by the kernel and set up as usual, but they won't output any data. This
will also fix the sensors on any other laptops with the same model of
sensor hub.

Signed-off-by: Stephen Chandler Paul <thatslyude@gmail.com>
Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>