Linus Torvalds 3f5785ec31 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (89 commits) bonding: documentation and code cleanup for resend_igmp bonding: prevent deadlock on slave store with alb mode (v3) net: hold rtnl again in dump callbacks Add Fujitsu 1000base-SX PCI ID to tg3 bnx2x: protect sequence increment with mutex sch_sfq: fix peek() implementation isdn: netjet - blacklist Digium TDM400P via-velocity: don't annotate MAC registers as packed xen: netfront: hold RTNL when updating features. sctp: fix memory leak of the ASCONF queue when free asoc net: make dev_disable_lro use physical device if passed a vlan dev (v2) net: move is_vlan_dev into public header file (v2) bug.h: Fix build with CONFIG_PRINTK disabled. wireless: fix fatal kernel-doc error + warning in mac80211.h wireless: fix cfg80211.h new kernel-doc warnings iwlagn: dbg_fixed_rate only used when CONFIG_MAC80211_DEBUGFS enabled dst: catch uninitialized metrics be2net: hash key for rss-config cmd not set bridge: initialize fake_rtable metrics net: fix __dst_destroy_metrics_generic() ... Fix up trivial conflicts in drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c		2011-05-25 17:00:17 -07:00
..
bitops	bitops: remove minix bitops from asm/bitops.h	2011-03-23 19:46:22 -07:00
4level-fixup.h	…
Kbuild	include: replace unifdef-y with header-y	2010-08-14 22:26:51 +02:00
Kbuild.asm	include: replace unifdef-y with header-y	2010-08-14 22:26:51 +02:00
atomic-long.h	…
atomic.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic	2010-10-22 11:17:06 -07:00
atomic64.h	…
audit_change_attr.h	audit: support the "standard" <asm-generic/unistd.h>	2011-05-04 14:41:28 -04:00
audit_dir_write.h	audit: support the "standard" <asm-generic/unistd.h>	2011-05-04 14:41:28 -04:00
audit_read.h	audit: support the "standard" <asm-generic/unistd.h>	2011-05-04 14:41:28 -04:00
audit_signal.h	…
audit_write.h	audit: support the "standard" <asm-generic/unistd.h>	2011-05-04 14:41:28 -04:00
auxvec.h	…
bitops.h	bitops: remove minix bitops from asm/bitops.h	2011-03-23 19:46:22 -07:00
bitsperlong.h	…
bug.h	bug.h: Fix build with CONFIG_PRINTK disabled.	2011-05-24 16:15:56 -04:00
bugs.h	…
cache.h	…
cacheflush.h	asm-generic/cacheflush.h: flush icache when copying to user pages	2011-05-25 08:39:37 -07:00
checksum.h	…
cmpxchg-local.h	Fix IRQ flag handling naming	2010-10-07 14:08:55 +01:00
cmpxchg.h	…
cputime.h	time: Add nsecs_to_cputime64 interface for asm-generic	2011-01-26 12:33:20 +01:00
current.h	…
delay.h	…
device.h	…
div64.h	…
dma-coherent.h	…
dma-mapping-broken.h	dma-mapping: remove dma_is_consistent API	2010-08-11 08:59:21 -07:00
dma-mapping-common.h	dma-mapping: remove unnecessary sync_single_range_* in dma_map_ops	2010-05-27 09:12:52 -07:00
dma.h	…
emergency-restart.h	…
errno-base.h	…
errno.h	mm: make __get_user_pages return -EHWPOISON for HWPOISON page optionally	2011-03-17 13:08:27 -03:00
fb.h	…
fcntl.h	New kind of open files - "location only".	2011-03-15 02:21:45 -04:00
ftrace.h	asm-generic headers: add ftrace.h	2011-03-17 09:19:04 +08:00
futex.h	futex: Sanitize futex ops argument types	2011-03-11 12:23:31 +01:00
getorder.h	…
gpio.h	Revert "gpiolib: annotate gpio-intialization with __must_check"	2011-01-13 17:26:46 -08:00
hardirq.h	Fix IRQ flag handling naming	2010-10-07 14:08:55 +01:00
hw_irq.h	…
ide_iops.h	…
int-l64.h	…
int-ll64.h	…
io.h	asm-generic: fix inX/outX functions for architectures that have PCI	2011-03-17 09:19:03 +08:00
ioctl.h	…
ioctls.h	tty: add TIOCVHANGUP to allow clean tty shutdown of all ttys	2011-02-17 14:16:30 -08:00
iomap.h	…
ipcbuf.h	…
irq.h	…
irq_regs.h	core: Replace __get_cpu_var with __this_cpu_read if not used for an address.	2010-12-17 15:07:19 +01:00
irqflags.h	Fix IRQ flag handling naming	2010-10-07 14:08:55 +01:00
kdebug.h	asm-generic: kdebug.h: Checkpatch cleanup	2010-10-09 21:51:44 +02:00
kmap_types.h	include/asm-generic/kmap_types.h: add helpful reminder	2010-05-25 08:07:03 -07:00
libata-portmap.h	…
linkage.h	…
local.h	…
local64.h	arch: Implement local64_t	2010-06-09 11:12:36 +02:00
memory_model.h	…
mm_hooks.h	…
mman-common.h	thp: mm: define MADV_NOHUGEPAGE	2011-01-13 17:32:47 -08:00
mman.h	…
mmu.h	…
mmu_context.h	…
module.h	…
msgbuf.h	…
mutex-dec.h	…
mutex-null.h	…
mutex-xchg.h	…
mutex.h	…
page.h	…
param.h	…
parport.h	…
pci-dma-compat.h	…
pci.h	…
percpu.h	percpu: Optimize __get_cpu_var()	2010-09-10 10:56:51 +02:00
pgalloc.h	…
pgtable-nopmd.h	…
pgtable-nopud.h	…
pgtable.h	[S390] merge page_test_dirty and page_clear_dirty	2011-05-23 10:24:31 +02:00
poll.h	…
posix_types.h	…
resource.h	ulimit: raise default hard ulimit on number of files to 4096	2011-05-25 08:39:43 -07:00
rtc.h	…
scatterlist.h	asm-generic: remove ARCH_HAS_SG_CHAIN in scatterlist.h	2010-05-27 09:12:54 -07:00
sections.h	x86: Separate out entry text section	2011-03-08 17:22:11 +01:00
segment.h	…
sembuf.h	…
serial.h	…
setup.h	…
shmbuf.h	…
shmparam.h	…
siginfo.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
signal-defs.h	…
signal.h	…
sizes.h	asm-generic headers: add sizes.h	2011-03-17 09:19:04 +08:00
socket.h	…
sockios.h	…
spinlock.h	…
stat.h	asm-generic/stat.h: support 64-bit file time_t for stat()	2010-11-01 15:31:29 -04:00
statfs.h	add f_flags to struct statfs(64)	2010-08-09 16:48:44 -04:00
string.h	…
swab.h	…
syscall.h	…
syscalls.h	Fix the declaration of sys_execve() in asm-generic/syscalls.h	2010-08-18 12:12:38 -07:00
system.h	asm-generic: cmpxchg does not handle non-long arguments	2010-10-09 21:51:27 +02:00
termbits.h	tty: Add EXTPROC support for LINEMODE	2010-08-10 13:47:39 -07:00
termios-base.h	…
termios.h	…
timex.h	…
tlb.h	mm: uninline large generic tlb.h functions	2011-05-25 08:39:20 -07:00
tlbflush.h	…
topology.h	topology: alternate fix for ia64 tiger_defconfig build breakage	2010-08-09 20:44:57 -07:00
types.h	add the common dma_addr_t typedef to include/linux/types.h	2011-03-22 17:44:09 -07:00
uaccess-unaligned.h	…
uaccess.h	asm-generic headers: add arch-specific __strnlen_user calling in uaccess.h	2011-03-17 09:19:05 +08:00
ucontext.h	…
unaligned.h	…
unistd.h	compat: fixes to allow working with tile arch	2011-05-12 15:51:36 -04:00
user.h	asm-generic/user.h: Fix spelling in comment	2011-03-01 15:49:39 +01:00
vga.h	…
vmlinux.lds.h	Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2011-05-24 11:53:42 -07:00
xor.h	sanitize <linux/prefetch.h> usage	2011-05-20 12:50:29 -07:00