Merge branch 'linus' into tracing/urgent
[pandora-kernel.git] / drivers / mtd / maps / sbc8240.c