Linus Torvalds d7e9660ad9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1623 commits) netxen: update copyright netxen: fix tx timeout recovery netxen: fix file firmware leak netxen: improve pci memory access netxen: change firmware write size tg3: Fix return ring size breakage netxen: build fix for INET=n cdc-phonet: autoconfigure Phonet address Phonet: back-end for autoconfigured addresses Phonet: fix netlink address dump error handling ipv6: Add IFA_F_DADFAILED flag net: Add DEVTYPE support for Ethernet based devices mv643xx_eth.c: remove unused txq_set_wrr() ucc_geth: Fix hangs after switching from full to half duplex ucc_geth: Rearrange some code to avoid forward declarations phy/marvell: Make non-aneg speed/duplex forcing work for 88E1111 PHYs drivers/net/phy: introduce missing kfree drivers/net/wan: introduce missing kfree net: force bridge module(s) to be GPL Subject: [PATCH] appletalk: Fix skb leak when ipddp interface is not loaded ... Fixed up trivial conflicts: - arch/x86/include/asm/socket.h converted to <asm-generic/socket.h> in the x86 tree. The generic header has the same new #define's, so that works out fine. - drivers/net/tun.c fix conflict between 89f56d1e9 ("tun: reuse struct sock fields") that switched over to using 'tun->socket.sk' instead of the redundantly available (and thus removed) 'tun->sk', and 2b980dbd ("lsm: Add hooks to the TUN driver") which added a new 'tun->sk' use. Noted in 'next' by Stephen Rothwell.		2009-09-14 10:37:28 -07:00
..
lzo	lzo: use get/put_unaligned_* helpers	2008-07-25 10:53:26 -07:00
reed_solomon
zlib_deflate
zlib_inflate	bzip2/lzma: library support for gzip, bzip2 and lzma decompression	2009-01-04 15:53:34 -08:00
.gitignore
argv_split.c
atomic64.c	lib: export generic atomic64_t functions	2009-07-29 19:10:35 -07:00
audit.c
bcd.c	rtc: BCD codeshrink	2008-07-24 10:47:33 -07:00
bitmap.c	Make bitmask 'and' operators return a result code	2009-08-21 09:26:15 -07:00
bitrev.c
bug.c	allow bug table entries to use relative pointers (and use it on x86-64)	2008-12-16 18:40:32 +01:00
bust_spinlocks.c	oops handling: ensure that any oops is flushed to the mtdoops console	2009-01-06 15:59:11 -08:00
check_signature.c
checksum.c	lib/checksum.c: fix endianess bug	2009-06-19 14:58:13 +02:00
cmdline.c	generic, memparse(): constify argument	2008-07-28 15:05:23 +02:00
cpumask.c	x86: remove some alloc_bootmem_cpumask_var calling	2009-06-11 19:27:07 +03:00
crc7.c
crc16.c
crc32.c
crc32defs.h
crc-ccitt.c
crc-itu-t.c
crc-t10dif.c
ctype.c
debug_locks.c	lockdep: warn about lockdep disabling after kernel taint	2009-04-12 16:10:51 +02:00
debugobjects.c	debugobjects: delay free of internal objects	2009-03-17 12:28:30 +01:00
dec_and_lock.c	atomic: only take lock when the counter drops to zero on UP as well	2009-06-16 19:47:47 -07:00
decompress_bunzip2.c	lib/decompress_*: only include <linux/slab.h> if STATIC is not defined	2009-08-07 10:39:56 -07:00
decompress_inflate.c	lib/decompress_*: only include <linux/slab.h> if STATIC is not defined	2009-08-07 10:39:56 -07:00
decompress_unlzma.c	lib/decompress_*: only include <linux/slab.h> if STATIC is not defined	2009-08-07 10:39:56 -07:00
decompress.c	bzip2/lzma: don't stop search at first unconfigured compression	2009-02-19 13:36:55 -08:00
devres.c
div64.c
dma-debug.c	dma-debug: Fix check_unmap null pointer dereference	2009-08-21 10:04:24 +02:00
dump_stack.c
dynamic_debug.c	Dynamic debug: fix typo: -/->	2009-07-28 13:45:22 -07:00
extable.c	module: trim exception table on init free.	2009-06-12 21:47:04 +09:30
fault-inject.c	Remove remaining unwinder code	2009-01-06 15:59:11 -08:00
find_last_bit.c	bitmap: find_last_bit()	2009-01-01 10:12:19 +10:30
find_next_bit.c
flex_array.c	flex_array: convert element_nr formals to unsigned	2009-08-26 20:06:52 -07:00
gcd.c	lib: add lib/gcd.c	2009-06-18 13:04:05 -07:00
gen_crc32table.c
genalloc.c	lib/genalloc.c: remove unmatched write_lock() in gen_pool_destroy	2009-06-16 19:47:53 -07:00
halfmd4.c
hexdump.c	hexdump: remove the trailing space	2009-06-16 19:47:51 -07:00
hweight.c
idr.c	cgroup: CSS ID support	2009-04-02 19:04:53 -07:00
inflate.c	inflate: refactor inflate malloc code	2008-07-25 10:53:28 -07:00
int_sqrt.c
iomap_copy.c
iomap.c	Use WARN() in lib/	2008-07-26 12:00:07 -07:00
iommu-helper.c	introduce generic iommu_num_pages function	2008-10-16 11:21:33 -07:00
ioremap.c
irq_regs.c
is_single_threaded.c	kernel: is_current_single_threaded: don't use ->mmap_sem	2009-07-17 09:11:31 +10:00
kasprintf.c
Kconfig	lib: Provide generic atomic64_t implementation	2009-06-15 13:27:38 +10:00
Kconfig.debug	Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-09-11 13:20:18 -07:00
Kconfig.kgdb	kgdb: remove the requirement for CONFIG_FRAME_POINTER	2008-08-01 08:39:34 -05:00
Kconfig.kmemcheck	kmemcheck: make kconfig accessible for other architectures	2009-06-15 15:49:17 +02:00
kernel_lock.c	sched: TIF_NEED_RESCHED -> need_reshed() cleanup	2009-03-06 12:48:55 +01:00
klist.c	driver core: Remove completion from struct klist_node	2009-01-06 10:44:30 -08:00
kobject_uevent.c	driver core: allow non-root users to listen to uevents	2009-04-16 16:17:09 -07:00
kobject.c	kobject: make kset_create check kobject_set_name return value	2009-06-15 21:30:24 -07:00
kref.c
libcrc32c.c	libcrc32c: Fix "crc32c undefined" compilation error	2008-12-25 11:01:42 +11:00
list_debug.c	list debugging: use WARN() instead of BUG()	2008-07-25 10:53:29 -07:00
lmb.c	lmb: Remove __init from lmb_end_of_DRAM()	2009-08-27 12:25:26 -07:00
locking-selftest-hardirq.h
locking-selftest-mutex.h
locking-selftest-rlock-hardirq.h
locking-selftest-rlock-softirq.h
locking-selftest-rlock.h
locking-selftest-rsem.h
locking-selftest-softirq.h
locking-selftest-spin-hardirq.h
locking-selftest-spin-softirq.h
locking-selftest-spin.h
locking-selftest-wlock-hardirq.h
locking-selftest-wlock-softirq.h
locking-selftest-wlock.h
locking-selftest-wsem.h
locking-selftest.c	locking: rename trace_softirq_[enter|exit] => lockdep_softirq_[enter|exit]	2009-03-13 01:32:36 +01:00
Makefile	lib: flexible array implementation	2009-07-29 19:10:36 -07:00
nlattr.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6	2009-03-26 22:45:23 -07:00
parser.c	vfs: Use const for kernel parser table	2008-10-13 10:10:37 -07:00
percpu_counter.c	Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-01-06 17:10:04 -08:00
plist.c	Use WARN() in lib/	2008-07-26 12:00:07 -07:00
prio_heap.c	lib: fix sparse shadowed variable warning	2009-01-06 15:59:11 -08:00
prio_tree.c
proportions.c	Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-01-06 17:10:04 -08:00
radix-tree.c	lib: do code optimization for radix_tree_lookup() and radix_tree_lookup_slot()	2009-06-16 19:47:49 -07:00
random32.c	random32: seeding improvement	2008-07-30 16:29:19 -07:00
ratelimit.c	__ratelimit() cpu flags can't be static	2008-07-28 16:30:20 -07:00
rational.c	lib: isolate rational fractions helper function	2009-06-11 08:51:08 -07:00
rbtree.c	rb_tree: remove redundant if()-condition in rb_erase()	2009-06-16 19:47:56 -07:00
reciprocal_div.c
rwsem-spinlock.c
rwsem.c
scatterlist.c	lib/scatterlist: add a flags to signalize mapping direction	2009-07-31 12:28:45 +02:00
sha1.c
show_mem.c	lib: generic show_mem()	2008-07-26 12:00:10 -07:00
smp_processor_id.c	cpumask: convert lib/smp_processor_id to new cpumask ops	2009-01-30 15:47:34 +01:00
sort.c	generic swap(): lib/sort.c: rename swap to swap_func	2009-01-08 08:31:14 -08:00
spinlock_debug.c
string_helpers.c	[SCSI] lib: string_get_size(): don't hang on zero; no decimals on exact	2008-10-23 11:42:20 -05:00
string.c
swiotlb.c	lib/swiotlb.c: Fix strange panic message selection logic when swiotlb fills up	2009-08-21 10:36:03 +02:00
syscall.c	task_current_syscall	2008-07-26 12:00:10 -07:00
textsearch.c	remove CONFIG_KMOD from lib	2008-07-22 19:24:31 +10:00
ts_bm.c
ts_fsm.c
ts_kmp.c
vsprintf.c	lib/vsprintf.c: Add "%pI6c" - print pointer as compressed ipv6 address	2009-08-29 00:19:26 -07:00