summaryrefslogtreecommitdiff
path: root/drivers/misc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-11-18 07:14:30 -0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-18 07:14:30 -0200
commite36d5058dbf85aacf2fadf508f275afd37c58576 (patch)
tree35f2525f2666b272028ed0e956d43d547581eeb6 /drivers/misc
parenta9098b372606a15745cdeb012de4ee91c0df82c4 (diff)
parentb85c804d5ad48f239871b95afbddd84422e06f25 (diff)
downloadlinux-3.10-e36d5058dbf85aacf2fadf508f275afd37c58576.tar.gz
linux-3.10-e36d5058dbf85aacf2fadf508f275afd37c58576.tar.bz2
linux-3.10-e36d5058dbf85aacf2fadf508f275afd37c58576.zip
Merge branch 'for-linus' of git://git.selinuxproject.org/~jmorris/linux-security
* 'for-linus' of git://git.selinuxproject.org/~jmorris/linux-security: encrypted-keys: module build fixes encrypted-keys: fix error return code Smack: smackfs cipso seq read repair
Diffstat (limited to 'drivers/misc')
0 files changed, 0 insertions, 0 deletions