tree 21661650720837e3f5ed8f8c5ded4c9b91a10e83
parent 80b810b276cf89587cdaa103e39027813b1be46c
parent b1e0d8b70fa31821ebca3965f2ef8619d7c5e316
author Linus Torvalds <torvalds@linux-foundation.org> 1349650570 +0900
committer Linus Torvalds <torvalds@linux-foundation.org> 1349650570 +0900

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

Pull kbuild fixes from Michal Marek:
 "Here are two fixes I intended to send after v3.6-rc7, but failed to do
  so.  So please pull them for v3.7-rc1 and they will be picked up by
  stable.

  The first one fixes gcc -x <language> syntax in various build-time
  tests, which icecream and possible other gcc wrappers did not
  understand (and yes, icecream is going to be fixed as well).

  The second one fixes make tar-pkg so that unpacking the tarball does
  not replace the /lib -> /usr/lib symlink on recent Fedora releases."

* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  kbuild: Fix gcc -x syntax
  kbuild: Do not package /boot and /lib in make tar-pkg