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

author Chuck Anderson <chuck.anderson@oracle.com>

Thu, 23 Mar 2017 17:56:15 +0000 (10:56 -0700)

committer Chuck Anderson <chuck.anderson@oracle.com>

Thu, 23 Mar 2017 17:56:15 +0000 (10:56 -0700)
author Chuck Anderson <chuck.anderson@oracle.com>
Thu, 23 Mar 2017 17:56:15 +0000 (10:56 -0700)
committer Chuck Anderson <chuck.anderson@oracle.com>
Thu, 23 Mar 2017 17:56:15 +0000 (10:56 -0700)
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
author	Chuck Anderson <chuck.anderson@oracle.com>
	Thu, 23 Mar 2017 17:56:15 +0000 (10:56 -0700)
committer	Chuck Anderson <chuck.anderson@oracle.com>
	Thu, 23 Mar 2017 17:56:15 +0000 (10:56 -0700)
		1	2
uek-rpm/ol6/config-x86_64	patch \|	diff1 \|	diff2 \|	blob \| history
uek-rpm/ol6/config-x86_64-debug	patch \|	diff1 \|	diff2 \|	blob \| history
uek-rpm/ol7/config-x86_64	patch \|	diff1 \|	diff2 \|	blob \| history
uek-rpm/ol7/config-x86_64-debug	patch \|	diff1 \|	diff2 \|	blob \| history