Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
[pandora-kernel.git] / arch / arm / mach-omap2 / board-generic.c
Simple merge