]> 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)
commitcdb55414dd11fb640a480426c6df6fdb28c5128a
tree804f5d28ada61b402d56281c9a047308d26347f4
parent5bdf7ba05d797b2267dc22668d6bd1ef77766e02
parentff312617892389c2d36ab25fa49d6d61c2fc5854
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