]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu...
authorCorey Minyard <cminyard@mvista.com>
Thu, 2 Nov 2017 16:19:15 +0000 (11:19 -0500)
committerCorey Minyard <cminyard@mvista.com>
Thu, 2 Nov 2017 16:19:15 +0000 (11:19 -0500)
commit6297fabd93f93182245383ba7de56bef829a796b
tree804f5d28ada61b402d56281c9a047308d26347f4
parentd7e17fe4f7a7d961cc4375c7d868bd353a039bc7
parentece1996a21eeb344b49200e627c6660111009c10
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>
drivers/char/ipmi/ipmi_poweroff.c
drivers/char/ipmi/ipmi_si_hotmod.c