diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-20 22:15:53 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-20 22:15:53 (GMT) |
commit | 810a4855513b9cb1a191301eb5e4e28b276cc318 (patch) | |
tree | ba9d7020e321c0736f04eb1c064e0561655004ac /crypto/zlib.c | |
parent | 6f8c9d2130893eda35ad9105e6e2a08db7f0da13 (diff) | |
parent | bd1ee804af8bdf2fd5131234330615f8aecbd9ed (diff) | |
download | linux-810a4855513b9cb1a191301eb5e4e28b276cc318.tar.xz |
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
Diffstat (limited to 'crypto/zlib.c')
0 files changed, 0 insertions, 0 deletions