Merge git://git.infradead.org/mtd-2.6

[pandora-kernel.git] / arch / mips / cavium-octeon / flash_setup.c

diff --cc arch/mips/cavium-octeon/flash_setup.c
Simple merge