git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
55b1274
bf1450a
)
Merge branch 'omap-pool'
author
Tony Lindgren
<tony@atomide.com>
Thu, 23 Apr 2009 19:49:17 +0000
(12:49 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Thu, 23 Apr 2009 19:49:17 +0000
(12:49 -0700)
Conflicts:
arch/arm/mach-omap2/clock24xx.c
include/asm-arm/.gitignore
include/linux/spi/ads7846.h
Trivial merge