]> git.baikalelectronics.ru Git - kernel.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)
commit610949cd80c2d8aab1171741aa54c7a3193d93c9
tree804f5d28ada61b402d56281c9a047308d26347f4
parentfc80ea4603df97563137278fa0a2482d25753edc
parent392ece205edfbc79d07453a11906f2c027d3c1b8
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