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: Sparc64: enable RDS modules
  uek-rpm: ol7: update linux-firmware dependency to 20140911-0.1.git365e80c.0.4
  uek-rpm: configs: disable PS2_VMMOUSE to avoid vmware platform breakage
  uek-rpm: configs: ol7: don't set EFI_VARS_PSTORE_DEFAULT_DISABLE

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