]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 893a771 c792446)
Merge branch 'topic/uek-4.1/rpm-build' of git://ca-git.us.oracle.com/linux-uek into...
authorSantosh Shilimkar <santosh.shilimkar@oracle.com>
Thu, 8 Oct 2015 15:24:16 +0000 (08:24 -0700)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Thu, 8 Oct 2015 15:24:16 +0000 (08:24 -0700)
* 'topic/uek-4.1/rpm-build' of git://ca-git.us.oracle.com/linux-uek:
  uek-rpm: configs: sync up configs with v4.1.9
  uek-rpm: build: Update the base release to 9 with stable v4.1.9
  uek-rpm: configs: Rationalise CRYPTO config for OL6

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

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
Unnamed repository; edit this file 'description' to name the repository.