summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2014-09-22 14:54:56 +0200
committerJames Morris <james.l.morris@oracle.com>2014-09-22 14:54:56 +0200
commit35e1efd25a9e7d5cf2884fa23441ab87353849bb (patch)
treeaa0e546b39fa4d0a434919ff106721dfc3777a3d /drivers/media
parentMerge branch 'smack-for-3.18' of git://git.gitorious.org/smack-next/kernel in... (diff)
parentKEYS: Check hex2bin()'s return when generating an asymmetric key ID (diff)
downloadlinux-35e1efd25a9e7d5cf2884fa23441ab87353849bb.tar.xz
linux-35e1efd25a9e7d5cf2884fa23441ab87353849bb.zip
Merge tag 'keys-next-20140922' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
Diffstat (limited to 'drivers/media')
0 files changed, 0 insertions, 0 deletions