David S. Miller 04f58c8854 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: Documentation/devicetree/bindings/net/micrel-ks8851.txt net/core/netpoll.c The net/core/netpoll.c conflict is a bug fix in 'net' happening to code which is completely removed in 'net-next'. In micrel-ks8851.txt we simply have overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-03-25 20:29:20 -04:00
..
partitions	block/partitions/efi.c: fix bound check	2013-11-21 16:42:27 -08:00
Kconfig	block: change config option name for cmdline partition parsing	2013-09-30 14:31:02 -07:00
Kconfig.iosched	blkcg: make CONFIG_BLK_CGROUP bool	2012-03-06 21:27:21 +01:00
Makefile	blk-mq: new multi-queue block IO queueing mechanism	2013-10-25 11:56:00 +01:00
blk-cgroup.c	Merge branch 'for-3.12/core' of git://git.kernel.dk/linux-block	2013-09-22 15:00:11 -07:00
blk-cgroup.h	net: Replace u64_stats_fetch_begin_bh to u64_stats_fetch_begin_irq	2014-03-14 22:41:36 -04:00
blk-core.c	block: free q->flush_rq in blk_init_allocated_queue error paths	2014-03-20 22:32:06 -07:00
blk-exec.c	blk-mq: merge blk_mq_insert_request and blk_mq_run_request	2014-02-21 08:58:48 -08:00
blk-flush.c	block: change flush sequence list addition back to front add	2014-03-08 20:31:31 -07:00
blk-integrity.c	bio-integrity: Convert to bvec_iter	2013-11-23 22:33:50 -08:00
blk-ioc.c	block: cleanup removing dependency on bootmem headers	2013-11-08 19:43:48 -07:00
blk-iopoll.c	block: Replace __get_cpu_var uses	2013-11-08 08:59:58 -07:00
blk-lib.c	block: add cond_resched() to potentially long running ioctl discard loop	2014-02-12 09:36:37 -07:00
blk-map.c	block: Abstract out bvec iterator	2013-11-23 22:33:47 -08:00
blk-merge.c	block: Explicitly handle discard/write same segments	2014-02-07 13:54:08 -07:00
blk-mq-cpu.c	rt,blk,mq: Make blk_mq_cpu_notify_lock a raw spinlock	2014-03-03 09:34:10 -07:00
blk-mq-cpumap.c	blk-mq: new multi-queue block IO queueing mechanism	2013-10-25 11:56:00 +01:00
blk-mq-sysfs.c	block: fix memory leaks on unplugging block device	2013-12-06 09:18:02 -07:00
blk-mq-tag.c	Merge branch 'for-linus' of git://git.kernel.dk/linux-block	2014-02-14 10:45:18 -08:00
blk-mq-tag.h	blk-mq: new multi-queue block IO queueing mechanism	2013-10-25 11:56:00 +01:00
blk-mq.c	blk-mq: add REQ_SYNC early	2014-03-07 08:15:28 -07:00
blk-mq.h	blk-mq: merge blk_mq_insert_request and blk_mq_run_request	2014-02-21 08:58:48 -08:00
blk-settings.c	bcache/md: Use raid stripe size	2014-01-08 13:05:09 -08:00
blk-softirq.c	kernel: remove CONFIG_USE_GENERIC_SMP_HELPERS	2013-11-15 09:32:22 +09:00
blk-sysfs.c	blk-mq: rework flush sequencing logic	2014-02-10 09:29:00 -07:00
blk-tag.c	block: Reserve only one queue tag for sync IO if only 3 tags are available	2013-06-28 21:32:27 +02:00
blk-throttle.c	Merge branch 'for-3.14/core' of git://git.kernel.dk/linux-block	2014-01-30 11:19:05 -08:00
blk-timeout.c	blk-mq: rework I/O completions	2014-02-10 09:27:31 -07:00
blk.h	block: __elv_next_request() shouldn't call into the elevator if bypassing	2014-01-30 12:57:25 -07:00
bsg-lib.c	bsg: Remove unused function bsg_goose_queue()	2012-12-06 14:33:02 +01:00
bsg.c	hlist: drop the node parameter from iterators	2013-02-27 19:10:24 -08:00
cfq-iosched.c	cgroup: replace cftype->read_seq_string() with cftype->seq_show()	2013-12-05 12:28:04 -05:00
cmdline-parser.c	block: remove unrelated header files and export symbol	2014-01-21 20:18:26 -08:00
compat_ioctl.c	kernel-wide: fix missing validations on __get/__put/__copy_to/__copy_from_user()	2013-09-11 15:58:18 -07:00
deadline-iosched.c	block: Convert kmalloc_node(...GFP_ZERO...) to kzalloc_node(...)	2013-09-11 13:22:03 -06:00
elevator.c	block: Abstract out bvec iterator	2013-11-23 22:33:47 -08:00
genhd.c	block: Convert kmalloc_node(...GFP_ZERO...) to kzalloc_node(...)	2013-09-11 13:22:03 -06:00
ioctl.c	block: replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO	2013-11-08 09:05:31 -07:00
noop-iosched.c	elevator: Fix a race in elevator switching	2013-07-03 13:25:24 +02:00
partition-generic.c	Revert "loop: cleanup partitions when detaching loop device"	2013-04-08 10:12:11 +02:00
scsi_ioctl.c	block: Fix memory leak in rw_copy_check_uvector() handling	2014-01-21 20:36:17 -08:00