Merge branch 'kbuild/kbuild' into kbuild/for-next
authorMichal Marek <mmarek@suse.cz>
Tue, 3 Aug 2010 12:24:38 +0000 (14:24 +0200)
committerMichal Marek <mmarek@suse.cz>
Tue, 3 Aug 2010 12:24:38 +0000 (14:24 +0200)
Conflicts:
arch/powerpc/Makefile


Trivial merge