diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-02-09 16:20:52 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-02-09 16:20:52 +0800 |
| commit | 054f8fe34189a62a0b87700c062a18c3a8421615 (patch) | |
| tree | 805b9cc11d537a66870978b1ea51fc66c5a8f9a9 /drivers/scsi/hptiop.h | |
| parent | 108df9c204f549150c7e1e3262ffd19bd624269e (diff) | |
| parent | 53752ea210016b548cfc3898e6a5ea338fcb6c2c (diff) | |
Merge remote-tracking branch 'lts/linux-3.18.y' into linux-linaro-lsk-v3.18lsk-v3.18-17.03lsk-v3.18-17.02
Conflicts:
arch/x86/boot/compressed/misc.h
Diffstat (limited to 'drivers/scsi/hptiop.h')
0 files changed, 0 insertions, 0 deletions