git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
dcd6c92
8d09a1b
)
Merge branch 'omap1-part2' into omap1
author
Tony Lindgren
<tony@atomide.com>
Fri, 20 Jan 2012 13:31:52 +0000
(
05:31
-0800)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 20 Jan 2012 13:31:52 +0000
(
05:31
-0800)
Conflicts:
drivers/leds/leds-ams-delta.c
Trivial merge