diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2014-12-08 07:42:02 -0800 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2014-12-08 07:42:25 -0800 |
| commit | 096cbc35eaecf5865a3274f21eae26955b32861b (patch) | |
| tree | 8c6f085fd648939bfbc6ae41cd3f0204e32c5e07 /drivers/leds/leds-pca9532.c | |
| parent | dc843ef00e79ef0466d4d66bb20beeccda92e003 (diff) | |
| parent | 79855d178557cc3e3ffd179fd26a64cef48dfb30 (diff) | |
| download | linux-next-096cbc35eaecf5865a3274f21eae26955b32861b.tar.gz | |
Merge remote-tracking branch 'scsi-queue/drivers-for-3.19' into for-linus
Conflicts:
drivers/scsi/scsi_debug.c
Agreed and tested resolution to a merge problem between a fix in scsi_debug
and a driver update
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/leds/leds-pca9532.c')
0 files changed, 0 insertions, 0 deletions