]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
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)
Conflicts:
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-rx51.c
drivers/mmc/host/omap_hsmmc.c

1  2 
drivers/mmc/host/omap_hsmmc.c

Simple merge