summary refs log tree commit diff
path: root/security/device_cgroup.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-12-13 13:21:28 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-12-13 13:21:28 -0800
commit1008ebb61e01e3152901b4c5f58bd01a60ed115b (patch)
tree1e7e5b683d732db34a1cb412099fe9b1f5d6ccc1 /security/device_cgroup.c
parentca3367518b89b7c1e593dee82a4a4c9bbdfa8695 (diff)
parentd81cae806af428898f63391b5d7cd7ba0d87025d (diff)
downloadlinux-1008ebb61e01e3152901b4c5f58bd01a60ed115b.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID fixes from Jiri Kosina:

 - Genius Gx Imperator Keyboard regression fix (missing break in case),
   by Ben Hutchings

 - duplicate sysfs entry error fix for hid-sensor-hub driver, by
   Srinivas Pandruvada

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: hid-sensor-hub: fix duplicate sysfs entry error
  HID: kye: Fix missing break in kye_report_fixup()
Diffstat (limited to 'security/device_cgroup.c')
0 files changed, 0 insertions, 0 deletions