summaryrefslogtreecommitdiff
path: root/scripts/kconfig/merge_config.sh
Commit message (Expand)AuthorAgeLines
* kconfig: sync with Linux 4.1Masahiro Yamada2015-07-27-11/+19
* Correct two non-functional misspellings "overrided".Robert P. J. Day2014-10-27-1/+1
* kconfig: import Kconfig files from Linux 3.16-rc7Masahiro Yamada2014-07-30-0/+150