Merge commit 'origin/queue' into for-queue
authorAlexander Graf <agraf@suse.de>
Wed, 31 Oct 2012 12:36:18 +0000 (13:36 +0100)
committerAlexander Graf <agraf@suse.de>
Wed, 31 Oct 2012 12:36:18 +0000 (13:36 +0100)
Conflicts:
arch/powerpc/include/asm/Kbuild
arch/powerpc/include/uapi/asm/Kbuild


Trivial merge