Merge branch 'topic/uek-4.1/uek-carry' of git://ca-git.us.oracle.com/linux-uek into...

author Santosh Shilimkar <santosh.shilimkar@oracle.com>

Fri, 20 Nov 2015 02:02:46 +0000 (18:02 -0800)

committer Santosh Shilimkar <santosh.shilimkar@oracle.com>

Fri, 20 Nov 2015 02:02:46 +0000 (18:02 -0800)
author Santosh Shilimkar <santosh.shilimkar@oracle.com>
Fri, 20 Nov 2015 02:02:46 +0000 (18:02 -0800)
committer Santosh Shilimkar <santosh.shilimkar@oracle.com>
Fri, 20 Nov 2015 02:02:46 +0000 (18:02 -0800)
diff --cc drivers/pci/quirks.c
Simple merge
diff --cc include/linux/blk_types.h
Simple merge
diff --cc include/linux/pci.h
Simple merge
author	Santosh Shilimkar <santosh.shilimkar@oracle.com>
	Fri, 20 Nov 2015 02:02:46 +0000 (18:02 -0800)
committer	Santosh Shilimkar <santosh.shilimkar@oracle.com>
	Fri, 20 Nov 2015 02:02:46 +0000 (18:02 -0800)
		1	2
drivers/pci/quirks.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/blk_types.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/pci.h	patch \|	diff1 \|	diff2 \|	blob \| history