aboutsummaryrefslogtreecommitdiff
path: root/arch/microblaze
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-30 18:13:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-30 18:13:17 -0700
commit2b17b4382c4bcb1952e9c6953284044970a274f3 (patch)
tree76999d2060412419fb9997c4efb732a8a7cc89d5 /arch/microblaze
parentf558c272386a0f7507cc8de7b6b5afc24d17fa9c (diff)
parent9875c42d6979a7db0b8d217e2a88095b753f482c (diff)
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'arch/microblaze')
0 files changed, 0 insertions, 0 deletions