]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0ff18e3 0821f20)
Merge git://www.linux-watchdog.org/linux-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Oct 2013 20:57:10 +0000 (13:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Oct 2013 20:57:10 +0000 (13:57 -0700)
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


Trivial merge
Linux kernel for KaRo TX COM modules