diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2014-04-01 19:05:09 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2014-04-01 19:05:09 +0200 |
| commit | ad295b6d5739ab24880a31be403bbc8fab62e177 (patch) | |
| tree | cd760a18bcfa6e59b8b63fc71e333ba394b1cd9c /security/selinux/ss | |
| parent | ba04a57b4acd05a764471b2accd02000f6641881 (diff) | |
| parent | c3d77fab51f40821de91a744e4b514e9e4e76a7c (diff) | |
| download | op-kernel-dev-ad295b6d5739ab24880a31be403bbc8fab62e177.zip op-kernel-dev-ad295b6d5739ab24880a31be403bbc8fab62e177.tar.gz | |
Merge branch 'for-3.15/hid-core-ll-transport-cleanup' into for-linus
Conflicts:
drivers/hid/hid-ids.h
drivers/hid/hid-sony.c
drivers/hid/i2c-hid/i2c-hid.c
Diffstat (limited to 'security/selinux/ss')
0 files changed, 0 insertions, 0 deletions
