projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ba4a63f
56942fe
)
Merge branch 'arch-timers' into for-linus
author
Russell King
<
[email protected]
>
Thu, 4 Oct 2012 22:02:26 +0000
(23:02 +0100)
committer
Russell King
<
[email protected]
>
Thu, 4 Oct 2012 22:02:26 +0000
(23:02 +0100)
Conflicts:
arch/arm/include/asm/timex.h
arch/arm/lib/delay.c
Trivial merge
projects / openwrt / staging / blogic.git / commitdiff