| commit | c3fa32b9764dc45dcf8a2231b1c110abc4a63e0b | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Wed Oct 23 16:28:39 2013 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Wed Oct 23 16:49:34 2013 -0400 |
| tree | 6cf2896a77b65bec64284681e1c3851eb3263e09 | |
| parent | 34d92d5315b64a3e5292b7e9511c1bb617227fb6 [diff] | |
| parent | 320437af954cbe66478f1f5e8b34cb5a8d072191 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Conflicts: drivers/net/usb/qmi_wwan.c include/net/dst.h Trivial merge conflicts, both were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>