kernel/linux
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ synced 2026-11-13 07:31:07 +00:00
Code Issues Releases Packages Activity

Merge commit '7185684' into omap-for-v3.10/timer

Browse source 
Conflicts:
	arch/arm/plat-omap/dmtimer.c

Resolve merge conflict in omap_device.c as per
Lothar Waßmann <LW@KARO-electronics.de>.
This commit is contained in:
Tony Lindgren 2013-04-03 10:32:47 -07:00
commit 43231b5be6
17 changed files with 49 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files