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