From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 20 Dec 2014 21:33:03 +0000 (-0800)
Subject: Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
X-Git-Tag: v3.19-rc1~6
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=787140ad6bb49422e2f114e9b8df18b242df00db;p=~emulex%2Finfiniband.git

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

Pull misc kbuild changes from Michal Marek:
 "There are only a few things in the misc branch:

   - Fix for bugon.cocci semantic patch
   - Kdevelop4 files are .gitignored
   - Put make binrpm-pkg on diet"

* 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  scripts/package: binrpm-pkg do not create source and devel package
  .gitignore: Add Kdevelop4 project files
  bugon.cocci: fix Options at the macro
---

787140ad6bb49422e2f114e9b8df18b242df00db