diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-31 03:13:17 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-31 03:13:17 +0200 |
| commit | 2b17b4382c4bcb1952e9c6953284044970a274f3 (patch) | |
| tree | 76999d2060412419fb9997c4efb732a8a7cc89d5 /security | |
| parent | Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | merge_config.sh: Add option to display redundant configs (diff) | |
| download | linux-2b17b4382c4bcb1952e9c6953284044970a274f3.tar.xz linux-2b17b4382c4bcb1952e9c6953284044970a274f3.zip | |
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 'security')
0 files changed, 0 insertions, 0 deletions