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)
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>
1  2 
drivers/hid/hid-core.c
include/linux/hid.h

Simple merge
Simple merge