summaryrefslogtreecommitdiff
path: root/kernel/torture.c
diff options
context:
space:
mode:
authorCorey Minyard <cminyard@mvista.com>2017-11-02 19:19:15 +0300
committerCorey Minyard <cminyard@mvista.com>2017-11-02 19:19:15 +0300
commit6297fabd93f93182245383ba7de56bef829a796b (patch)
tree804f5d28ada61b402d56281c9a047308d26347f4 /kernel/torture.c
parentd7e17fe4f7a7d961cc4375c7d868bd353a039bc7 (diff)
parentece1996a21eeb344b49200e627c6660111009c10 (diff)
downloadlinux-6297fabd93f93182245383ba7de56bef829a796b.tar.xz
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 'kernel/torture.c')
0 files changed, 0 insertions, 0 deletions