Merge branch 'omap-pool'
authorTony Lindgren <tony@atomide.com>
Thu, 23 Apr 2009 19:49:17 +0000 (12:49 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 23 Apr 2009 19:49:17 +0000 (12:49 -0700)
Conflicts:
arch/arm/mach-omap2/clock24xx.c
include/asm-arm/.gitignore
include/linux/spi/ads7846.h


Trivial merge