Merge 3.13-rc4 into staging-next.
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 17 Dec 2013 01:12:04 +0000 (17:12 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 17 Dec 2013 01:12:04 +0000 (17:12 -0800)
commit5c5bccb76cb94888f40ebd5584b81646632e9c3f
treeee949fa6cc1dbe2632154b38ef6dd28f6185d218
parent24b3aa09970304ece816e73c3d7174d0dd315b98
parent319e2e3f63c348a9b66db4667efa73178e18b17d
Merge 3.13-rc4 into staging-next.

We want the fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Documentation/devicetree/bindings/vendor-prefixes.txt
include/linux/hid-sensor-ids.h