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
..
configs	[IA64] fix "allnoconfig" build	2011-08-09 12:36:00 -07:00
dig	x86, ia64: convert to use generic dma_map_ops struct	2009-01-06 14:06:57 +01:00
hp	net: remove use of ndo_set_multicast_list in drivers	2011-08-17 20:22:03 -07:00
include/asm	Merge branch 'gpiolib' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6	2011-08-01 13:41:43 -10:00
kernel	All Arch: remove linkage for sys_nfsservctl system call	2011-08-26 15:09:58 -07:00
kvm	virtio: expose for non-virtualization users too	2011-07-23 16:20:30 +09:30
lib	Fix common misspellings	2011-03-31 11:26:23 -03:00
mm	mm: now that all old mmu_gather code is gone, remove the storage	2011-05-25 08:39:16 -07:00
oprofile	[IA64] fix build warning in arch/ia64/oprofile/backtrace.c	2011-04-07 11:05:56 -07:00
pci	ACPI: pci_root: pass acpi_pci_root to arch-specific scan	2010-04-04 00:29:53 -04:00
scripts	scripts: change scripts to use system python instead of env	2010-02-02 14:33:56 +01:00
sn	Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-07-22 17:05:15 -07:00
uv	ia64: change to new flag variables	2011-03-17 14:02:56 +01:00
xen	sched: Provide scheduler_ipi() callback in response to smp_send_reschedule()	2011-04-14 08:52:32 +02:00
Kconfig	[IA64] fix "allnoconfig" build	2011-08-09 12:36:00 -07:00
Kconfig.debug	[PATCH] Move Kprobes and Oprofile to "Instrumentation Support" menu	2005-11-07 07:53:35 -08:00
Makefile	Merge commit 'v2.6.35' into kbuild/kbuild	2010-08-04 13:59:13 +02:00
install.sh	kbuild: use INSTALLKERNEL to select customized installkernel script	2009-09-20 12:18:14 +02:00
module.lds	…