David S. Miller aa11d958d1 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: arch/microblaze/include/asm/socket.h		2009-08-12 17:44:53 -07:00
..
drivers	net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functions	2009-07-05 19:16:04 -07:00
include	mm: Pass virtual address to [__]p{te,ud,md}_free_tlb()	2009-07-27 12:10:38 -07:00
kernel	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
os-Linux	uml: improve error messages	2009-04-01 08:59:16 -07:00
scripts
sys-i386	uml: fix a section warning	2009-06-16 19:47:47 -07:00
sys-ia64	uml: remove useless comments	2009-04-01 08:59:17 -07:00
sys-ppc	uml: remove useless comments	2009-04-01 08:59:17 -07:00
sys-x86_64	uml: bad macro expansion, parameter is member	2009-06-16 19:47:47 -07:00
defconfig
Kconfig.char
Kconfig.common
Kconfig.debug
Kconfig.net
Kconfig.rest	uml: kill a kconfig warning	2009-04-21 13:41:50 -07:00
Kconfig.um
Kconfig.x86
Makefile	get rid of the last symlink in uml build	2009-01-05 17:41:45 -08:00
Makefile-i386
Makefile-ia64
Makefile-os-Linux
Makefile-ppc
Makefile-skas
Makefile-x86_64