Merge branch topic/uek-4.1/upstream-cherry-picks of git://ca-git.us.oracle.com/linux...

diff --cc drivers/pci/pci.c
Simple merge

diff --cc drivers/pci/probe.c
Simple merge

diff --cc drivers/pci/quirks.c
Simple merge

diff --cc fs/btrfs/extent_io.c
Simple merge

diff --cc fs/btrfs/inode.c
Simple merge

diff --cc include/linux/pci.h
Simple merge