projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e8ff63 7345520)
ARM: Merge for-2635/s5p-audio
authorBen Dooks <ben-linux@fluff.org>
Wed, 19 May 2010 09:05:33 +0000 (18:05 +0900)
committerBen Dooks <ben-linux@fluff.org>
Wed, 19 May 2010 09:05:33 +0000 (18:05 +0900)
Merge branch 'for-2635/s5p-audio' into for-linus/samsung2

1  2 
arch/arm/mach-s5p6440/Makefile patch | diff1 | diff2 | blob | history
arch/arm/mach-s5p6440/include/mach/map.h patch | diff1 | diff2 | blob | history
arch/arm/mach-s5p6442/Makefile patch | diff1 | diff2 | blob | history
arch/arm/mach-s5p6442/include/mach/map.h patch | diff1 | diff2 | blob | history
arch/arm/mach-s5pv210/Makefile patch | diff1 | diff2 | blob | history
arch/arm/mach-s5pv210/include/mach/map.h patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mach-s5p6440/Makefile
Simple merge
diff --cc arch/arm/mach-s5p6442/Makefile
Simple merge
diff --cc arch/arm/mach-s5pv210/Makefile
Simple merge