projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8f6b767 0eb043d)
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 2 Apr 2012 16:42:55 +0000 (09:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 2 Apr 2012 16:42:55 +0000 (09:42 -0700)
commit97754175042e77d02c4232d5fb24c16abd1c77f1
tree5f318edf0420807259835b40c3a269f8e1267057tree | snapshot
parent8f6b7676ceecc1f40df77d5a4d6a8bae87594a2dcommit | diff
parent0eb043d0eec44cd083ea6910b1db2f77eb212ebdcommit | diff
Merge branch 'rc-fixes' of git://git./linux/kernel/git/mmarek/kbuild

Pull 'make cscope' fix from Michal Marek:
 "The kbuild.git#misc pull request introduced a bug that broke make
  cscope.  Apparently, both the original author and me only tested the
  use case that the commit was supposed to improve (make tags/TAGS), and
  not the use case that was not supposed (make cscope)."

* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  tags.sh: Add missing quotes
John Crispins staging tree