Linus Torvalds 6fe4c6d466 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (86 commits) ipv4: fix redirect handling ping: dont increment ICMP_MIB_INERRORS sky2: fix hang in napi_disable sky2: enforce minimum ring size bonding: Don't allow mode change via sysfs with slaves present f_phonet: fix page offset of first received fragment stmmac: fix pm functions avoiding sleep on spinlock stmmac: remove spin_lock in stmmac_ioctl. stmmac: parameters auto-tuning through HW cap reg stmmac: fix advertising 1000Base capabilties for non GMII iface stmmac: use mdelay on timeout of sw reset sky2: version 1.30 sky2: used fixed RSS key sky2: reduce default Tx ring size sky2: rename up/down functions sky2: pci posting issues sky2: fix hang on shutdown (and other irq issues) r6040: fix check against MCRO_HASHEN bit in r6040_multicast_list MAINTAINERS: change email address for shemminger pch_gbe: Move #include of module.h ...		2011-11-20 14:59:33 -08:00
..
alpha	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
arm	Merge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm	2011-11-20 14:34:58 -08:00
avr32	Merge git://git.infradead.org/mtd-2.6	2011-11-07 09:11:16 -08:00
blackfin	blackfin: Fixup export.h includes	2011-11-14 17:15:23 +08:00
cris	net: Fix references to deleted NET_ETHERNET Kconfig setting.	2011-11-09 19:26:53 -05:00
frv	kgdb: follow rename pack_hex_byte() to hex_byte_pack()	2011-10-31 17:30:56 -07:00
h8300	Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6	2011-10-29 07:27:45 -07:00
hexagon	Hexagon: Add basic stacktrace functionality for Hexagon architecture.	2011-11-01 07:34:21 -07:00
ia64	Merge branch 'upstream/xen-settime' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen	2011-11-06 20:15:05 -08:00
m32r	Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2011-11-06 18:54:53 -08:00
m68k	m68k/mac: Remove mac_irq_{en,dis}able() wrappers	2011-11-08 22:35:52 +01:00
microblaze	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
mips	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2011-11-15 22:44:45 -02:00
mn10300	kgdb: follow rename pack_hex_byte() to hex_byte_pack()	2011-10-31 17:30:56 -07:00
openrisc	Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2011-11-06 18:54:53 -08:00
parisc	parisc: Add export.h to files needing EXPORT_SYMBOL/THIS_MODULE	2011-10-31 19:31:00 -04:00
powerpc	Merge branch 'kvm-updates/3.2' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2011-11-20 14:57:43 -08:00
s390	Merge branch 'kvm-updates/3.2' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2011-11-20 14:57:43 -08:00
score	score: drop unused Kconfig symbols	2011-10-31 23:39:51 +01:00
sh	Merge branches 'sh/pm-runtime' and 'common/clkfwk' into sh-fixes-for-linus	2011-11-11 16:16:25 +09:00
sparc	sparc64: Patch sun4v code sequences properly on module load.	2011-11-17 22:44:58 -08:00
tile	Merge branch 'for-linus' of git://github.com/cmetcalf-tilera/linux-tile	2011-11-04 12:33:34 -07:00
um	Merge branch 'for-linus' of git://github.com/richardweinberger/linux	2011-11-02 09:45:39 -07:00
unicore32	unicore32, exec: remove redundant set_fs(USER_DS)	2011-11-16 10:50:09 +08:00
x86	Merge branch 'kvm-updates/3.2' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2011-11-20 14:57:43 -08:00
xtensa	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-26 17:15:03 +02:00
.gitignore
Kconfig	Add Kconfig option ARCH_HAVE_NMI_SAFE_CMPXCHG	2011-08-03 11:12:37 -04:00