Merge branch 'master' of /home/tglx/work/kernel/git/mtd-2.6/