Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6