2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 13:43:55 +08:00
linux-next/Documentation/devicetree
David S. Miller 24bc518a68 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/wireless/iwlwifi/pcie/tx.c

Minor iwlwifi conflict in TX queue disabling between 'net', which
removed a bogus warning, and 'net-next' which added some status
register poking code.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-11-25 12:49:17 -05:00
..
bindings Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-11-25 12:49:17 -05:00
00-INDEX Documentation: add devicetree docs index file 2011-03-16 10:47:03 -07:00
booting-without-of.txt dt/documentation: Fix value format description 2012-05-19 15:03:28 -06:00
usage-model.txt usage-model.txt: fix typo machine_init->init_machine 2012-07-06 07:16:33 -05:00