diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-14 22:49:15 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-14 22:49:15 +0300 |
| commit | 9c488de24f7264f08d341024bffdd637b4d04c96 (patch) | |
| tree | a644ba6ccaed95729b121a1ccd269ace4e383b33 /drivers/iio/industrialio-event.c | |
| parent | 57e6bbcb4beb4c87aa93e78a1db08fdaab9ee65f (diff) | |
| parent | eda2116f4ab6d79cfcffc202b5d2bbb0797ba013 (diff) | |
| download | linux-9c488de24f7264f08d341024bffdd637b4d04c96.tar.xz | |
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
Pull CIFS fixes from Steve French:
"Two small cifs fixes"
* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
[CIFS] mount option sec=none not displayed properly in /proc/mounts
CIFS: fix type confusion in copy offload ioctl
Diffstat (limited to 'drivers/iio/industrialio-event.c')
0 files changed, 0 insertions, 0 deletions