]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'omap-fixes'
authorTony Lindgren <tony@atomide.com>
Tue, 7 Apr 2009 23:36:16 +0000 (16:36 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 7 Apr 2009 23:36:16 +0000 (16:36 -0700)
commit2d9aaa76288b9a4d6aca5067154ceb09122aacd8
treea4f18a4b9e735dac5ecbd226bb33392ccb8979a7
parenta3307eaf1390bd5dbe36de6116a1ce73a4c61cfa
parent4bec62825b94dcfe7b9156fdc5af9381134b2bf8
Merge branch 'omap-fixes'

Conflicts:
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-rx51.c
drivers/mmc/host/omap_hsmmc.c
drivers/mmc/host/omap_hsmmc.c