asm-generic: merge branch 'master' of torvalds/linux-2.6