| commit | dc25b25897289bad4907f30151ffe5baf75ff369 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Fri Aug 21 11:44:04 2015 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Fri Aug 21 11:44:04 2015 -0700 |
| tree | c99301de2cdf66d7af48fc43b6161bda6faaae70 | |
| parent | 1a69205c471221a7f9101df164642611e37c52e4 [diff] | |
| parent | 0bad90985d39e69ca035fdd70bcc743812641d18 [diff] |
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>