| commit | b26e478f8fd5b575684f021b05a5c6236ebb911a | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Fri Dec 16 02:11:14 2011 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Fri Dec 16 02:11:14 2011 -0500 |
| tree | 27d3b3eaf3fe10d05319ad3395b2569ad5f8f6d0 | |
| parent | bcebcc468a6bcd3820fe9ad36b34220563efc93a [diff] | |
| parent | bb3c36863e8001fc21a88bebfdead4da4c23e848 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Conflicts: drivers/net/ethernet/freescale/fsl_pq_mdio.c net/batman-adv/translation-table.c net/ipv6/route.c