diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-25 23:44:33 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-25 23:44:33 +0100 |
commit | b6d97026561a6ed6eed58428633a6bb4e1b78c57 (patch) | |
tree | aa14520be1485fe1eab56e24a28d63797c1ef54c /drivers/spi/spi_sh_msiof.c | |
parent | Merge branch 'for-linus-1' of git://git.kernel.org/pub/scm/linux/kernel/git/r... (diff) | |
parent | kconfig: Simplify LSMOD= handling (diff) | |
download | linux-b6d97026561a6ed6eed58428633a6bb4e1b78c57.tar.xz linux-b6d97026561a6ed6eed58428633a6bb4e1b78c57.zip |
Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig
* 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig:
kconfig: Simplify LSMOD= handling
kconfig: Add LSMOD=file to override the lsmod for localmodconfig
kconfig: Look in both /bin and /sbin for lsmod in streamline_config.pl
kconfig: Check for if conditions in Kconfig for localmodconfig
kconfig: Create include/generated for localmodconfig
Diffstat (limited to 'drivers/spi/spi_sh_msiof.c')
0 files changed, 0 insertions, 0 deletions