block: misc updates from codeaurora

	modified:   block/blk-core.c
	modified:   block/deadline-iosched.c