projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dc47ce9 f36217f)
Merge branch 'musb' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux...
authorOlof Johansson <olof@lixom.net>
Fri, 16 Dec 2011 05:21:08 +0000 (21:21 -0800)
committerOlof Johansson <olof@lixom.net>
Fri, 16 Dec 2011 05:21:08 +0000 (21:21 -0800)
1  2 
arch/arm/kernel/perf_event.c patch | diff1 | diff2 | blob | history
mm/vmalloc.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/kernel/perf_event.c
Simple merge
diff --cc mm/vmalloc.c
Simple merge