summaryrefslogtreecommitdiff
path: root/security/smack
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-06-27 21:42:05 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-06-27 21:42:05 +0400
commit8ecd93ab84ce018e032298f55e1b18ada0362850 (patch)
tree53fedf2060d54ea8e4252e68018b50ddc0b9160a /security/smack
parentd6236f6d1d885aa19d1cd7317346fe795227a3cc (diff)
parent66085694866458623ac4196d1f8b3e11adab0a82 (diff)
downloadlinux-8ecd93ab84ce018e032298f55e1b18ada0362850.tar.xz
Merge tag 'usb-serial-3.16-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus
Johan writes: USB-serial fixes for v3.16-rc3 Here are some USB-serial updates for v3.16-rc3 that fix a reported NULL-pointer dereference and add some new device IDs. Included is also two changes to MAINTAINERS dropping individual maintainership for two small sub-drivers and updating an email address. Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'security/smack')
0 files changed, 0 insertions, 0 deletions