summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2009-03-30 13:14:53 (GMT)
committerJiri Kosina <jkosina@suse.cz>2009-03-30 13:14:53 (GMT)
commit621de593081524da2f0f7b060f5951b4155eb4a2 (patch)
treedcb1777094498496a3036b0e49546887e72d6a06 /security
parentafa5eb7c68689ced4284f01c96feed44a2d0a127 (diff)
parent6d77976800c3f29a0337fadcc9ddd79050fa5620 (diff)
downloadlinux-fsl-qoriq-621de593081524da2f0f7b060f5951b4155eb4a2.tar.xz
Merge branch 'autosuspend' into for-next
Conflicts: drivers/hid/hid-core.c
Diffstat (limited to 'security')
0 files changed, 0 insertions, 0 deletions