]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'omap-pool'
authorTony Lindgren <tony@atomide.com>
Fri, 3 Apr 2009 23:33:04 +0000 (16:33 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 3 Apr 2009 23:33:04 +0000 (16:33 -0700)
commitcc5c842355cbbc85153b3db3571cad0d32991c8b
tree65d3a215f4ea7eae6d890e3831a071aed359cbd5
parent985dbcbf5d52b0f80c1f94bcb018b6431fd9d580
parente6cb73629ec43b7bd5c79d285f7e293cd7e7395f
Merge branch 'omap-pool'

Conflicts:
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-rx51.c