]> 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: 06b3620 b42e493)
Merge branch topic/uek-4.1/xen of git://ca-git.us.oracle.com/linux-uek into uek/uek-4.1
authorChuck Anderson <chuck.anderson@oracle.com>
Mon, 18 Apr 2016 10:24:38 +0000 (03:24 -0700)
committerChuck Anderson <chuck.anderson@oracle.com>
Mon, 18 Apr 2016 10:24:38 +0000 (03:24 -0700)
1  2 
arch/x86/xen/enlighten.c patch | diff1 | diff2 | blob | history
drivers/xen/Makefile patch | diff1 | diff2 | blob | history

diff --cc arch/x86/xen/enlighten.c
Simple merge
diff --cc drivers/xen/Makefile
Simple merge
Unnamed repository; edit this file 'description' to name the repository.