git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 667a344)
ARM: OMAP: Manual merge after updating to 2.6.16
authorTony Lindgren <tony@atomide.com>
Mon, 20 Mar 2006 16:05:39 +0000 (08:05 -0800)
committerTony Lindgren <tony@atomide.com>
Mon, 20 Mar 2006 16:05:39 +0000 (08:05 -0800)
Manual merge after updating to 2.6.16

kernel/timer.c patch | blob | history

diff --cc kernel/timer.c
Simple merge
Pandora Kernel Repository