Merge branch 'omap-pool'
authorTony Lindgren <tony@atomide.com>
Wed, 15 Apr 2009 18:22:24 +0000 (11:22 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 15 Apr 2009 18:22:24 +0000 (11:22 -0700)
Conflicts:
arch/arm/mach-omap2/board-overo.c
arch/arm/mach-omap2/board-rx51.c
drivers/Makefile


Trivial merge