diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-10 13:57:10 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-10 13:57:10 -0700 |
commit | f112bf8585b9ce4e3cce2eee6b8319eb9fee3ec1 (patch) | |
tree | 8792159f0212c3b296c5894f85f68b9d443672b0 /kernel/trace/Makefile | |
parent | 0ff18e3734c248fa516b4be942b1196832ee936c (diff) | |
parent | 0821f20d49d19f49e53b05ef6727e010c4b1f11d (diff) | |
download | linux-f112bf8585b9ce4e3cce2eee6b8319eb9fee3ec1.tar.bz2 |
Merge git://www.linux-watchdog.org/linux-watchdog
Pull watchdog fix from Wim Van Sebroeck:
"Make sure that the hpwdt driver will not load auxilary iLO devices"
* git://www.linux-watchdog.org/linux-watchdog:
watchdog: hpwdt: Patch to ignore auxilary iLO devices
Diffstat (limited to 'kernel/trace/Makefile')
0 files changed, 0 insertions, 0 deletions