David S. Miller 04f58c8854 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	Documentation/devicetree/bindings/net/micrel-ks8851.txt
	net/core/netpoll.c

The net/core/netpoll.c conflict is a bug fix in 'net' happening
to code which is completely removed in 'net-next'.

In micrel-ks8851.txt we simply have overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

2014-03-25 20:29:20 -04:00

..

af_key.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-03-25 20:29:20 -04:00

Makefile

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00