David S. Miller d4185bbf62 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c Minor conflict between the BCM_CNIC define removal in net-next and a bug fix added to net. Based upon a conflict resolution patch posted by Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-11-10 18:32:51 -05:00
..
configs	[IA64] defconfig: Remove CONFIG_MISC_DEVICES	2012-08-20 13:04:29 -07:00
dig	Disintegrate asm/system.h for IA64	2012-03-28 18:30:02 +01:00
hp	TTY: use tty_port_link_device	2012-08-13 16:50:19 -07:00
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-11-10 18:32:51 -05:00
kernel	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2012-10-13 10:04:42 +09:00
kvm	KVM: split kvm_arch_flush_shadow	2012-09-06 16:37:25 +03:00
lib	Fix common misspellings	2011-03-31 11:26:23 -03:00
mm	mm: fix-up zone present pages	2012-10-09 16:22:54 +09:00
oprofile	Disintegrate asm/system.h for IA64	2012-03-28 18:30:02 +01:00
pci	Merge branch 'pci/yinghai-misc' into next	2012-09-24 17:24:11 -06:00
scripts	scripts: change scripts to use system python instead of env	2010-02-02 14:33:56 +01:00
sn	ia64/PCI: Use hotplug-safe pci_get_domain_bus_and_slot()	2012-09-12 14:10:33 -06:00
uv	ia64: change to new flag variables	2011-03-17 14:02:56 +01:00
xen	sections: fix section conflicts in arch/ia64	2012-10-06 03:04:39 +09:00
install.sh	kbuild: use INSTALLKERNEL to select customized installkernel script	2009-09-20 12:18:14 +02:00
Kconfig	Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux	2012-10-14 13:39:34 -07:00
Kconfig.debug
Makefile	Merge commit 'v2.6.35' into kbuild/kbuild	2010-08-04 13:59:13 +02:00
module.lds