]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
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)
Conflicts:
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-rx51.c


Trivial merge