]> 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: c609900 c7c99c7)
Merge branch 'topic/uek-4.1/drivers' of git://ca-git.us.oracle.com/linux-uek into...
authorChuck Anderson <chuck.anderson@oracle.com>
Fri, 8 Jul 2016 21:02:52 +0000 (14:02 -0700)
committerChuck Anderson <chuck.anderson@oracle.com>
Fri, 8 Jul 2016 21:02:52 +0000 (14:02 -0700)
1  2 
uek-rpm/ol6/config-x86_64 patch | diff1 | diff2 | blob | history
uek-rpm/ol7/config-x86_64 patch | diff1 | diff2 | blob | history

diff --cc uek-rpm/ol6/config-x86_64
Simple merge
diff --cc uek-rpm/ol7/config-x86_64
Simple merge
Unnamed repository; edit this file 'description' to name the repository.