aboutsummaryrefslogtreecommitdiff
path: root/fs/udf/dir.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman2015-05-14 12:43:36 -0700
committerGreg Kroah-Hartman2015-05-14 12:43:36 -0700
commit569192605f56f384090be8c291a3f4a02402ad84 (patch)
tree13a8ce058434b5f8d23931fc32feffd06f45a336 /fs/udf/dir.c
parent172115090f5e739660b97694618a2ba86457063a (diff)
parent82ee3aeb9295c5fc37fd2ddf20f13ac2b40ec97d (diff)
Merge tag 'usb-serial-4.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus
Johan writes: USB-serial fixes for v4.1-rc4 Here are a few device-id changes removing a duplicate entry, refining another and adding a third. Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'fs/udf/dir.c')
0 files changed, 0 insertions, 0 deletions