diff options
| author | David S. Miller <davem@davemloft.net> | 2015-08-21 21:44:04 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-21 21:44:04 +0300 |
| commit | dc25b25897289bad4907f30151ffe5baf75ff369 (patch) | |
| tree | c99301de2cdf66d7af48fc43b6161bda6faaae70 /drivers/spi/spi-fsl-lib.c | |
| parent | 1a69205c471221a7f9101df164642611e37c52e4 (diff) | |
| parent | 0bad90985d39e69ca035fdd70bcc743812641d18 (diff) | |
| download | linux-dc25b25897289bad4907f30151ffe5baf75ff369.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/usb/qmi_wwan.c
Overlapping additions of new device IDs to qmi_wwan.c
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/spi/spi-fsl-lib.c')
0 files changed, 0 insertions, 0 deletions