git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
99f0b8d
53db20d
)
Merge branch 'omap-for-v3.8/cleanup-headers-mmc' into omap-for-v3.8/cleanup-headers
author
Tony Lindgren
<tony@atomide.com>
Wed, 17 Oct 2012 18:13:42 +0000
(11:13 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 17 Oct 2012 18:13:42 +0000
(11:13 -0700)
Conflicts:
arch/arm/mach-omap1/devices.c
arch/arm/mach-omap2/omap_hwmod_33xx_data.c
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
drivers/mmc/host/omap.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff