| commit | 34f9f437104b86f6ddfa2770e2cd852846385dc3 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Mon Dec 09 20:20:14 2013 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Mon Dec 09 20:20:14 2013 -0500 |
| tree | 6c78386b3db9dd47fd2b79efb4dcf8c1472de99e | |
| parent | 95dc19299f741c986227ec33e23cbf9b3321f812 [diff] | |
| parent | 66e56cd46b93ef407c60adcac62cf33b06119d50 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Merge 'net' into 'net-next' to get the AF_PACKET bug fix that Daniel's direct transmit changes depend upon. Signed-off-by: David S. Miller <davem@davemloft.net>