Huang, Tao bbf44583ac Merge branch 'torvalds/master' ... Signed-off-by: Huang, Tao <huangtao@rock-chips.com> Conflicts: arch/arm/include/asm/arm-cci.h drivers/android/binder.c drivers/android/binder_trace.h drivers/block/zram/Kconfig drivers/net/wireless/rockchip_wlan/esp8089/esp_premalloc/version.h include/kvm/arm_arch_timer.h include/linux/pl320-ipc.h include/linux/zsmalloc.h include/uapi/linux/android/binder.h		2015-11-11 19:52:00 +08:00
..
partitions	Merge branch 'torvalds/master'	2015-11-11 19:52:00 +08:00
bio-integrity.c	block: blk_flush_integrity() for bio-based drivers	2015-10-21 14:43:44 -06:00
bio.c	mm, page_alloc: distinguish between being unable to sleep, unwilling to sleep and avoiding waking kswapd	2015-11-06 17:50:42 -08:00
blk-cgroup.c	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
blk-core.c	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
blk-exec.c	block: move PM request support to IDE	2015-05-05 13:40:42 -06:00
blk-flush.c	blk-mq: fix race between timeout and freeing request	2015-08-15 09:45:21 -06:00
blk-integrity.c	block, libnvdimm, nvme: provide a built-in blk_integrity nop profile	2015-10-21 14:43:45 -06:00
blk-ioc.c	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
blk-iopoll.c	Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next	2014-06-03 12:57:53 -07:00
blk-lib.c	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
blk-map.c	block: Copy a user iovec if it includes gaps	2015-09-11 09:03:50 -06:00
blk-merge.c	block: avoid to merge splitted bio	2015-10-21 15:00:51 -06:00
blk-mq-cpu.c	blk-mq: add file comments and update copyright notices	2014-05-28 10:15:41 -06:00
blk-mq-cpumap.c	blk-mq: avoid inserting requests before establishing new mapping	2015-09-29 11:32:50 -06:00
blk-mq-sysfs.c	block: generic request_queue reference counting	2015-10-21 14:43:41 -06:00
blk-mq-tag.c	mm, page_alloc: distinguish between being unable to sleep, unwilling to sleep and avoiding waking kswapd	2015-11-06 17:50:42 -08:00
blk-mq-tag.h	blk-mq: factor out a helper to iterate all tags for a request_queue	2015-10-01 10:10:57 +02:00
blk-mq.c	mm, page_alloc: rename __GFP_WAIT to __GFP_RECLAIM	2015-11-06 17:50:42 -08:00
blk-mq.h	blk-mq: remove unused blk_mq_clone_flush_request prototype	2015-10-09 11:16:39 -06:00
blk-settings.c	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
blk-softirq.c	block: fix regression with block enabled tagging	2014-04-09 21:54:06 -06:00
blk-sysfs.c	Merge branch 'for-4.4/integrity' of git://git.kernel.dk/linux-block	2015-11-04 20:51:48 -08:00
blk-tag.c	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
blk-throttle.c	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
blk-timeout.c	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
blk.h	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
bounce.c	Merge branch 'for-linus' of git://git.kernel.dk/linux-block	2015-09-19 18:57:09 -07:00
bsg-lib.c
bsg.c	block: Simplify bsg complete all	2015-02-04 09:57:52 -07:00
cfq-iosched.c	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
cmdline-parser.c	Revert "block: support embedded device command line partition"	2015-11-11 14:25:17 +08:00
compat_ioctl.c	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
deadline-iosched.c	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
elevator.c	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
genhd.c	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
ioctl.c	block: add an API for Persistent Reservations	2015-10-21 14:46:56 -06:00
ioprio.c	pidns: fix set/getpriority and ioprio_set/get in PRIO_USER mode	2015-11-06 17:50:42 -08:00
Kconfig	Revert "block: support embedded device command line partition"	2015-11-11 14:25:17 +08:00
Kconfig.iosched
Makefile	Revert "block: support embedded device command line partition"	2015-11-11 14:25:17 +08:00
noop-iosched.c	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
partition-generic.c	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
scsi_ioctl.c	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
t10-pi.c	block: Consolidate static integrity profile properties	2015-10-21 14:42:38 -06:00