git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3ac3af2
)
ARM: OMAP: Temporary change to avoid merge conflicts
author
Tony Lindgren
<tony@atomide.com>
Wed, 29 Jun 2005 13:21:36 +0000
(06:21 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 29 Jun 2005 13:21:36 +0000
(06:21 -0700)
Added back arch/arm/mach-omap/time.c and removed
drivers/i2c/chips/tps65010.c to avoid merge conflicts.
No differences found