David S. Miller 8decf86879 Merge branch 'master' of github.com:davem330/net ... Conflicts: MAINTAINERS drivers/net/Kconfig drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c drivers/net/ethernet/broadcom/tg3.c drivers/net/wireless/iwlwifi/iwl-pci.c drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c drivers/net/wireless/rt2x00/rt2800usb.c drivers/net/wireless/wl12xx/main.c		2011-09-22 03:23:13 -04:00
..
boot	xtensa: change to new flag variable	2011-03-17 14:02:57 +01:00
configs	xtensa: remove obsolete BKL kernel option from defconfig	2011-04-11 14:56:22 +02:00
include/asm	All Arch: remove linkage for sys_nfsservctl system call	2011-08-26 15:09:58 -07:00
kernel	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
lib	xtensa: move headers files to arch/xtensa/include	2008-11-06 10:25:09 -08:00
mm	mm: now that all old mmu_gather code is gone, remove the storage	2011-05-25 08:39:16 -07:00
platforms	net: remove use of ndo_set_multicast_list in drivers	2011-08-17 20:22:03 -07:00
variants	XTENSA: static should be at beginning of declaration	2011-07-11 14:13:47 +02:00
Kconfig	xtensa: Use generic config PREEMPT definition	2011-07-05 18:01:16 +02:00
Kconfig.debug	[PATCH] xtensa: Architecture support for Tensilica Xtensa Part 1	2005-06-24 00:05:21 -07:00
Makefile	xtensa: Add -mforce-no-pic option is supported	2010-05-02 01:00:22 -07:00