tree ba9d7020e321c0736f04eb1c064e0561655004ac
parent 6f8c9d2130893eda35ad9105e6e2a08db7f0da13
parent bd1ee804af8bdf2fd5131234330615f8aecbd9ed
author Linus Torvalds <torvalds@linux-foundation.org> 1356041753 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1356041753 -0800

Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

Pull kbuild changes from Michal Marek:
 "The kbuild changes are minimal this time:

   - scripts/pnmlogo fix for some newer format

   - minor top-level Makefile cleanup

   - fix for a v3.5 regression with make clean M=<directory>"

* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  kbuild: Do not remove vmlinux when cleaning external module
  scripts/pnmtologo: fix for plain PBM
  kbuild: Remove reference to uninitialised variable