Merge branch 'omap-pool'
authorTony Lindgren <tony@atomide.com>
Tue, 7 Apr 2009 23:27:19 +0000 (16:27 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 7 Apr 2009 23:27:19 +0000 (16:27 -0700)
Conflicts:
drivers/Makefile


Trivial merge