xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
f56f52e02a9c3da4bc2cc6eb9ddcf5602ea44b37
android_kernel_xiaomi_sm8450/arch/arm/mach-omap2/timer.c
Tony Lindgren f56f52e02a Merge branch 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3' into omap-for-v3.8/dt 
Conflicts:
	arch/arm/plat-omap/dmtimer.c

Resolved as suggested by Jon Hunter.
2012-11-09 14:54:17 -08:00

19 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink