diff options
| author | Corey Minyard <cminyard@mvista.com> | 2017-11-02 17:19:15 +0100 |
|---|---|---|
| committer | Corey Minyard <cminyard@mvista.com> | 2017-11-02 17:19:15 +0100 |
| commit | 6297fabd93f93182245383ba7de56bef829a796b (patch) | |
| tree | 804f5d28ada61b402d56281c9a047308d26347f4 /arch/mips/include/asm/setup.h | |
| parent | ipmi_si: Delete an error message for a failed memory allocation in try_smi_in... (diff) | |
| parent | module: Do not paper over type mismatches in module_param_call() (diff) | |
| download | linux-6297fabd93f93182245383ba7de56bef829a796b.tar.xz linux-6297fabd93f93182245383ba7de56bef829a796b.zip | |
Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux into for-next
The IPMI SI driver was split into different pieces, merge the module
tree to accountfor that.
Signed-off-by: Corey Minyard <cminyard@mvista.com>
Diffstat (limited to 'arch/mips/include/asm/setup.h')
0 files changed, 0 insertions, 0 deletions