Merge branch 'for-3.11/CVE-2013-2888' into for-3.12/upstream
authorJiri Kosina <jkosina@suse.cz>
Wed, 4 Sep 2013 10:06:25 +0000 (12:06 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 4 Sep 2013 10:06:58 +0000 (12:06 +0200)
commit47ab1a2de42031021965b81cbab4f3b4c5696d07
tree292df51948f1afa0277108df3001462ae6a5e3b1
parentbe67b68d52fa28b9b721c47bb42068f0c1214855
parent43622021d2e2b82ea03d883926605bdd0525e1d1
Merge branch 'for-3.11/CVE-2013-2888' into for-3.12/upstream

This one didn't make it for 3.11 due to being applied too close
to release, queue it for 3.12 merge window.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/hid-core.c
include/linux/hid.h