Linus Torvalds 4a73a43741 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: vlan: dont drop packets from unknown vlans in promiscuous mode Phonet: Correct header retrieval after pskb_may_pull um: Proper Fix for f25c80a4: remove duplicate structure field initialization ip_gre: Fix dependencies wrt. ipv6. net-2.6: SYN retransmits: Add new parameter to retransmits_timed_out() iwl3945: queue the right work if the scan needs to be aborted mac80211: fix use-after-free		2010-10-04 11:11:01 -07:00
..
drivers	um: Proper Fix for f25c80a4: remove duplicate structure field initialization	2010-09-29 19:30:11 -07:00
include	uml: fix compile error in dma_get_cache_alignment()	2010-08-20 09:34:55 -07:00
kernel	uml: fix compile warning	2010-09-22 17:22:39 -07:00
os-Linux	Deal with missing exports for hostfs	2010-08-09 16:47:25 -04:00
scripts
sys-i386	Merge branch 'master' into for-next	2010-04-23 02:08:44 +02:00
sys-ia64	uml: remove useless comments	2009-04-01 08:59:17 -07:00
sys-ppc	elf: kill USE_ELF_CORE_DUMP	2009-12-16 07:20:12 -08:00
sys-x86_64	UML: Fix compiler warning due to missing task_struct declaration	2010-04-21 01:43:03 +02:00
.gitignore	um: tell git to ignore generated files	2010-03-06 11:26:28 -08:00
defconfig
Kconfig.char
Kconfig.common	time: Kill off CONFIG_GENERIC_TIME	2010-07-27 12:40:54 +02:00
Kconfig.debug
Kconfig.net
Kconfig.rest	uml: kill a kconfig warning	2009-04-21 13:41:50 -07:00
Kconfig.um	x86, um: get rid of arch/um/Kconfig.arch	2008-10-22 22:55:23 -07:00
Kconfig.x86	x86, um: get rid of arch/um/Kconfig.arch	2008-10-22 22:55:23 -07:00
Makefile	kbuild: move asm-offsets.h to include/generated	2009-12-12 13:08:14 +01:00
Makefile-i386
Makefile-ia64
Makefile-os-Linux	x86, um: get rid of arch/um/os symlink	2008-10-22 22:55:22 -07:00
Makefile-ppc
Makefile-skas
Makefile-x86_64