David S. Miller 076ce44825 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/chelsio/cxgb4vf/sge.c drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c sge.c was overlapping two changes, one to use the new __dev_alloc_page() in net-next, and one to use s->fl_pg_order in net. ixgbe_phy.c was a set of overlapping whitespace changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-11-14 01:01:12 -05:00
..
bindings	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-11-14 01:01:12 -05:00
00-INDEX	Documentation/: update 00-INDEX files	2014-02-10 16:01:40 -08:00
booting-without-of.txt	dt/documentation: add specification of dma bus information	2014-09-26 11:18:05 -05:00
changesets.txt	of: Transactional DT support.	2014-07-23 17:29:15 -06:00
dynamic-resolution-notes.txt	of: Introduce Device Tree resolve support.	2014-10-04 21:24:26 +01:00
of_selftest.txt	To remove non-ascii characters in of_selftest.txt	2014-10-06 09:52:39 +01:00
todo.txt	of: Add todo tasklist for Devicetree	2014-07-23 17:33:01 -06:00
usage-model.txt	doc: device tree: clarify stuff in usage-model.txt.	2013-06-18 13:46:27 +02:00