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

* 'topic/uek-4.1/rpm-build' of git://ca-git.us.oracle.com/linux-uek:
  uek-rpm: configs: change the x86_64 default governor to ondemand
  uek-rpm: configs: sync up the EFIVAR_FS between ol6 and ol7
  uek-rpm: use the latest 0.5 version of linux-firmware

diff --cc uek-rpm/ol6/config-x86_64
Simple merge

diff --cc uek-rpm/ol6/config-x86_64-debug
Simple merge

diff --cc uek-rpm/ol7/config-x86_64
Simple merge

diff --cc uek-rpm/ol7/config-x86_64-debug
Simple merge