David S. Miller 8fd90bb889 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/infiniband/hw/cxgb4/device.c

The cxgb4 conflict was simply overlapping changes.

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

2014-07-22 00:44:59 -07:00

..

bindings

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

2014-07-22 00:44:59 -07:00

00-INDEX

Documentation/: update 00-INDEX files

2014-02-10 16:01:40 -08:00

booting-without-of.txt

dt/bindings: Remove all references to device_type "ethernet-phy"

2014-01-16 11:11:51 +00:00

usage-model.txt

…