From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 5 Aug 2010 21:20:14 +0000 (-0700)
Subject: Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
X-Git-Tag: v2.6.36-rc1~545
X-Git-Url: https://bbs.cooldavid.org/git/?p=net-next-2.6.git;a=commitdiff_plain;h=f43100ae39bfeb757b75835ef61f0c2c46c99348

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

* 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  scripts/dtc: Fix a resource leak
  Documentation: fix ubuntu distro name
  MAINTAINERS: Update kbuild git URLs
  Add support for the C variable in the coccicheck script
  Add scripts/coccinelle/deref_null.cocci
  Add scripts/coccinelle/err_cast.cocci
  Add scripts/coccinelle/resource_size.cocci
  Add scripts/coccinelle/alloc/kzalloc-simple.cocci
  Add scripts/coccinelle/alloc/drop_kmalloc_cast.cocci
  Add Documentation/coccinelle.txt
  Add a target to use the Coccinelle checker
  scripts: decodecode: remove bashisms
  Makefile: clarify a comment
  checkkconfigsymbols.sh: Kconfig symbols sometimes have lowercase letters
  scripts: add nconf into gitignore file
---

f43100ae39bfeb757b75835ef61f0c2c46c99348
diff --cc Makefile
index 968ac2af763,8acf7edad82..66c94aad366
--- a/Makefile
+++ b/Makefile
@@@ -418,9 -412,9 +418,9 @@@ endi
  # of make so .config is not included in this case either (for *config).
  
  no-dot-config-targets := clean mrproper distclean \
- 			 cscope TAGS tags help %docs check% \
+ 			 cscope TAGS tags help %docs check% coccicheck \
  			 include/linux/version.h headers_% \
 -			 kernelrelease kernelversion
 +			 kernelversion
  
  config-targets := 0
  mixed-targets  := 0