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

* topic/uek-4.1/drivers: (262 commits)
  scsi: qla2xxx: Fix apparent cut-n-paste error.
  scsi: qla2xxx: Fix Target mode handling with Multiqueue changes.
  scsi: qla2xxx: Add Block Multi Queue functionality.
  scsi: qla2xxx: Add multiple queue pair functionality.
  qla2xxx: Add irq affinity notification
  scsi: qla2xxx: Fix scsi scan hang triggered if adapter fails during init
  be2net: get rid of custom busy poll code
  be2net: fix initial MAC setting
  be2net: fix MAC addr setting on privileged BE3 VFs
  be2net: don't delete MAC on close on unprivileged BE3 VFs
  be2net: fix status check in be_cmd_pmac_add()
  be2net: Increase skb headroom size to 256 bytes
  be2net: Add DEVSEC privilege to SET_HSW_CONFIG command.
  be2net: do not call napi_hash_del()
  be2net: Enable VF link state setting for BE3
  be2net: Fix TX stats for TSO packets
  be2net: Update Copyright string in be_hw.h
  be2net: NCSI FW section should be properly updated with ethtool for BE3
  be2net: Provide an alternate way to read pf_num for BEx chips
  be2net: mark symbols static where possible
  ...

Conflicts:
	drivers/net/ethernet/intel/i40e/i40e_main.c
	drivers/scsi/be2iscsi/be_main.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_main.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_attr.c
Simple merge