git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c2bc111 d65670a)
Merge branch 'formingo/3.2/tip/timers/core' of git://git.linaro.org/people/jstultz...
authorIngo Molnar <mingo@elte.hu>
Fri, 11 Nov 2011 07:10:42 +0000 (08:10 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 11 Nov 2011 07:10:42 +0000 (08:10 +0100)
Conflicts:
kernel/time/timekeeping.c

1  2 
kernel/time/timekeeping.c patch | diff1 | diff2 | blob | history

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