flo: Linux 3.4.91

Conflicts:
	include/trace/events/block.h
	kernel/trace/blktrace.c

Change-Id: Iea6b2d89e4eeedad9da3a2e58ffd3bed45d8bd44
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: doc <doc.divxm@gmail.com>