David S. Miller dda922c831 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/phy/amd-xgbe-phy.c drivers/net/wireless/iwlwifi/Kconfig include/net/mac80211.h iwlwifi/Kconfig and mac80211.h were both trivial overlapping changes. The drivers/net/phy/amd-xgbe-phy.c file got removed in 'net-next' and the bug fix that happened on the 'net' side is already integrated into the rest of the amd-xgbe driver. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-06-01 22:51:30 -07:00
..
fonts
lz4	lib/lz4: Pull out constant tables	2015-03-25 15:04:57 +01:00
lzo
mpi
raid6	md/raid6 algorithms: xor_syndrome() for SSE2	2015-04-22 08:00:42 +10:00
reed_solomon
xz
zlib_deflate
zlib_inflate
.gitignore
argv_split.c
asn1_decoder.c
assoc_array.c
atomic64.c
atomic64_test.c
audit.c
average.c
bcd.c
bch.c
bitmap.c	lib/bitmap.c: bitmap_[empty,full]: remove code duplication	2015-04-17 09:03:56 -04:00
bitrev.c
bsearch.c
btree.c
bug.c
build_OID_registry
bust_spinlocks.c
check_signature.c
checksum.c
clz_ctz.c
clz_tab.c
cmdline.c
compat_audit.c
cordic.c
cpu-notifier-error-inject.c
cpu_rmap.c
cpumask.c	cpumask_set_cpu_local_first => cpumask_local_spread, lament	2015-05-28 11:05:20 +09:30
crc-ccitt.c
crc-itu-t.c
crc-t10dif.c
crc7.c
crc8.c
crc16.c
crc32.c
crc32defs.h
ctype.c
debug_locks.c
debugobjects.c
dec_and_lock.c
decompress.c
decompress_bunzip2.c
decompress_inflate.c
decompress_unlz4.c
decompress_unlzma.c
decompress_unlzo.c
decompress_unxz.c
devres.c	lib: devres: add a helper function for ioremap_wc	2015-03-16 21:11:32 +01:00
digsig.c
div64.c	lib: correct link to the original source for div64_u64	2015-03-06 23:19:27 +01:00
dma-debug.c	lib/dma-debug: fix bucket_find_contain()	2015-04-17 09:03:54 -04:00
dump_stack.c
dynamic_debug.c
dynamic_queue_limits.c	lib/dynamic_queue_limits.c: simplify includes	2015-02-12 18:54:15 -08:00
earlycpio.c
extable.c
fault-inject.c
fdt.c
fdt_empty_tree.c
fdt_ro.c
fdt_rw.c
fdt_strerror.c
fdt_sw.c
fdt_wip.c
find_bit.c	lib: rename lib/find_next_bit.c to lib/find_bit.c	2015-04-17 09:03:54 -04:00
flex_array.c
flex_proportions.c
gcd.c
gen_crc32table.c	lib: crc32: constify crc32 lookup table	2015-02-13 21:21:35 -08:00
genalloc.c	lib/genalloc.c: check result of devres_alloc()	2015-02-13 21:21:36 -08:00
glob.c
halfmd4.c	lib/halfmd4.c: simplify includes	2015-02-12 18:54:15 -08:00
hexdump.c	hexdump: make it return number of bytes placed in buffer	2015-02-12 18:54:15 -08:00
hweight.c
idr.c	lib/idr.c: remove redundant include	2015-02-12 18:54:15 -08:00
inflate.c
int_sqrt.c
interval_tree.c	lib/interval_tree.c: simplify includes	2015-02-12 18:54:15 -08:00
interval_tree_test.c
iomap.c
iomap_copy.c
iommu-common.c	iommu-common: rename iommu_pool_hash to iommu_hash_common	2015-04-20 14:09:55 -04:00
iommu-helper.c
ioremap.c	x86, mm: support huge KVA mappings on x86	2015-04-14 16:49:04 -07:00
iov_iter.c	Merge branch 'iov_iter' into for-next	2015-04-11 22:26:51 -04:00
irq_regs.c
is_single_threaded.c
jedec_ddr_data.c
kasprintf.c
Kconfig	This is the final removal (after several years!) of the obsolete cpus_*	2015-04-20 10:19:03 -07:00
Kconfig.debug	Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2015-05-06 10:26:37 -07:00
Kconfig.kasan	kasan: show gcc version requirements in Kconfig and Documentation	2015-05-05 17:10:10 -07:00
Kconfig.kgdb
Kconfig.kmemcheck
kfifo.c
klist.c
kobject.c	kobject: WARN as tip when call kobject_get() to a kobject not initialized	2015-03-25 15:26:49 +01:00
kobject_uevent.c	lib/kobject_uevent.c: remove redundant include	2015-02-12 18:54:15 -08:00
kstrtox.c
kstrtox.h
lcm.c	block: fix blk_stack_limits() regression due to lcm() change	2015-03-31 09:45:50 -06:00
libcrc32c.c
list_debug.c
list_sort.c	lib/list_sort.c: rearrange includes	2015-02-12 18:54:15 -08:00
llist.c	lib/llist.c: remove redundant include	2015-02-12 18:54:15 -08: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
lockref.c	locking: Remove ACCESS_ONCE() usage	2015-02-24 08:44:16 +01:00
lru_cache.c	lru_cache: remove use of seq_printf return value	2015-04-15 16:35:25 -07:00
Makefile	Break up monolithic iommu table/lock into finer graularity pools and lock	2015-04-18 12:32:59 -07:00
md5.c	lib/md5.c: simplify include	2015-02-12 18:54:15 -08:00
memory-notifier-error-inject.c
memweight.c
net_utils.c
nlattr.c	netlink: pad nla_memcpy dest buffer with zeroes	2015-03-31 14:07:24 -04:00
notifier-error-inject.c
notifier-error-inject.h
of-reconfig-notifier-error-inject.c
oid_registry.c
parser.c
pci_iomap.c
percpu-refcount.c
percpu_counter.c	percpu_counter: batch size aware __percpu_counter_compare()	2015-05-29 07:39:34 +10:00
percpu_ida.c	lib/percpu_ida.c: remove redundant includes	2015-02-12 18:54:16 -08:00
percpu_test.c
plist.c	lib/plist.c: remove redundant include	2015-02-12 18:54:16 -08:00
pm-notifier-error-inject.c
proportions.c
radix-tree.c	lib/radix-tree.c: change to simpler include	2015-02-12 18:54:16 -08:00
random32.c
ratelimit.c
rational.c
rbtree.c
rbtree_test.c
reciprocal_div.c
rhashtable.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-05-23 01:22:35 -04:00
scatterlist.c
seq_buf.c	seq_buf: Fix seq_buf_bprintf() truncation	2015-03-04 23:40:19 -05:00
sha1.c	lib: EXPORT_SYMBOL sha_init	2015-03-23 22:12:08 -04:00
show_mem.c	lib/show_mem.c: remove redundant include	2015-02-12 18:54:16 -08:00
smp_processor_id.c
sort.c	lib/sort.c: move include inside #if 0	2015-02-12 18:54:16 -08:00
stmp_device.c	lib/stmp_device.c: replace module.h include	2015-02-12 18:54:16 -08:00
string.c	lib: make memzero_explicit more robust against dead store elimination	2015-05-04 17:49:51 +08:00
string_helpers.c	SCSI misc on 20150416	2015-04-16 19:02:04 -04:00
strncpy_from_user.c	lib/strncpy_from_user.c: replace module.h include	2015-02-12 18:54:16 -08:00
strnlen_user.c
swiotlb.c
syscall.c
test-hexdump.c	hexdump: avoid warning in test function	2015-04-19 13:48:40 -07:00
test-kstrtox.c
test-string_helpers.c	lib/string_helpers.c: change semantics of string_escape_mem	2015-04-15 16:35:24 -07:00
test_bpf.c	test_bpf: add similarly conflicting jump test case only for classic	2015-05-27 14:05:59 -04:00
test_firmware.c
test_kasan.c	lib: add kasan test module	2015-02-13 21:21:41 -08:00
test_module.c
test_rhashtable.c	rhashtable-test: Fix 64bit division	2015-05-05 19:30:47 -04:00
test_user_copy.c
textsearch.c
timerqueue.c
ts_bm.c
ts_fsm.c
ts_kmp.c
ucs2_string.c
usercopy.c
uuid.c
vsprintf.c	lib/vsprintf.c: improve put_dec_trunc8 slightly	2015-04-17 09:03:55 -04:00