]> 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: dee06f1 5194907)
Merge branch 'stable/tracing' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad...
authorGuru Anbalagane <guru.anbalagane@oracle.com>
Tue, 6 Sep 2011 06:37:25 +0000 (23:37 -0700)
committerGuru Anbalagane <guru.anbalagane@oracle.com>
Tue, 6 Sep 2011 06:37:25 +0000 (23:37 -0700)
1  2 
arch/x86/xen/Makefile patch | diff1 | diff2 | blob | history
arch/x86/xen/enlighten.c patch | diff1 | diff2 | blob | history

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