David S. Miller 3505d1a9fd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	drivers/net/sfc/sfe4001.c
	drivers/net/wireless/libertas/cmd.c
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/staging/rtl8187se/Kconfig
	drivers/staging/rtl8192e/Kconfig

2009-11-18 22:19:03 -08:00

..

boot

arch/alpha/boot/tools/objstrip.c: Mark "usage" static

2009-11-15 15:01:38 -08:00

include/asm

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2009-11-18 22:19:03 -08:00

kernel

net: Introduce recvmmsg socket syscall

2009-10-12 23:40:10 -07:00

lib

remove __attribute_used__

2008-01-28 23:21:18 +01:00

math-emu

alpha: fix conversion from denormal float to double

2008-01-17 15:38:59 -08:00

mm

arches: drop superfluous casts in nr_free_pages() callers

2009-09-22 07:17:34 -07:00

oprofile

oprofile: more whitespace fixes

2008-10-15 20:55:51 +02:00

defconfig

alpha/parisc: remove config variable DEBUG_RWLOCK

2008-02-06 10:41:03 -08:00

Kconfig

alpha: convert to use arch_gettimeoffset()

2009-09-22 07:17:43 -07:00

Kconfig.debug

alpha/parisc: remove config variable DEBUG_RWLOCK

2008-02-06 10:41:03 -08:00

Makefile

alpha: link failure fix

2008-06-20 16:46:10 -07:00