projects / platform / kernel / linux-amlogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f558c27 9875c42)
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 31 Mar 2012 01:13:17 +0000 (18:13 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 31 Mar 2012 01:13:17 +0000 (18:13 -0700)
commit2b17b4382c4bcb1952e9c6953284044970a274f3
tree76999d2060412419fb9997c4efb732a8a7cc89d5tree | snapshot
parentf558c272386a0f7507cc8de7b6b5afc24d17fa9ccommit | diff
parent9875c42d6979a7db0b8d217e2a88095b753f482ccommit | diff
Merge branch 'kconfig' of git://git./linux/kernel/git/mmarek/kbuild

Pull kconfig bits from Michal Marek:
 "There is one fix for make oldconfig by Arnaud and updates to the
  merge_config.sh tool."

* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  merge_config.sh: Add option to display redundant configs
  merge_config.sh: Set execute bit
  merge_config.sh: Use the first file as the initial config
  kconfig: fix new choices being skipped upon config update
Domain: System / Kernel;