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
..
asm	of/address: sparc: Declare of_iomap as an extern function for sparc again	2012-11-23 22:01:15 +00:00
uapi/asm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-11-17 22:00:43 -05:00