Merge branch 'for-next' into for-linus

[linux-2.6-block.git] / arch / arm / mach-omap2 / board-zoom-peripherals.c

diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c
old mode 100755 (executable)
new mode 100644 (file)