]> 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: 78ccd65 85be401)
Merge branch topic/uek-4.1/rpm-build of git://ca-git.us.oracle.com/linux-uek into... v4.1.12-93
authorChuck Anderson <chuck.anderson@oracle.com>
Thu, 9 Mar 2017 07:39:22 +0000 (23:39 -0800)
committerChuck Anderson <chuck.anderson@oracle.com>
Thu, 9 Mar 2017 07:39:22 +0000 (23:39 -0800)
* topic/uek-4.1/rpm-build:
  uek-config: enable CONFIG_MOUSE_PS2_VMMOUSE
  uek-rpm: enable CONFIG_KSPLICE.

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.