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

[pandora-kernel.git] / arch / sh / include / mach-sdk7786 / mach / fpga.h

diff --cc arch/sh/include/mach-sdk7786/mach/fpga.h
Simple merge