diff options
author | Jens Axboe <axboe@fb.com> | 2014-09-11 19:31:18 +0400 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2014-09-11 19:31:18 +0400 |
commit | b207892b061da7608878e273ae22ba9bf9be264b (patch) | |
tree | 51daa46b89b83cad422941f52110b19571b85b79 /tools/usb/usbip/AUTHORS | |
parent | 018a17bdc8658ad448497c84d4ba21b6985820ec (diff) | |
parent | a516440542afcb9647f88d12c35640baf02d07ea (diff) | |
download | linux-b207892b061da7608878e273ae22ba9bf9be264b.tar.xz |
Merge branch 'for-linus' into for-3.18/core
A bit of churn on the for-linus side that would be nice to have
in the core bits for 3.18, so pull it in to catch us up and make
forward progress easier.
Signed-off-by: Jens Axboe <axboe@fb.com>
Conflicts:
block/scsi_ioctl.c
Diffstat (limited to 'tools/usb/usbip/AUTHORS')
-rw-r--r-- | tools/usb/usbip/AUTHORS | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/usb/usbip/AUTHORS b/tools/usb/usbip/AUTHORS new file mode 100644 index 000000000000..a27ea8d03aec --- /dev/null +++ b/tools/usb/usbip/AUTHORS @@ -0,0 +1,3 @@ +Takahiro Hirofuchi +Robert Leibl +matt mooney <mfm@muteddisk.com> |