]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 89307ba 0d09858)
Merge git://www.linux-watchdog.org/linux-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Dec 2011 20:13:03 +0000 (12:13 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Dec 2011 20:13:03 +0000 (12:13 -0800)
commit995b4103a78b9bef0ff834f9ecac42b2b56e01a8
tree2914c6906dfbf9b9c5b8c0ca6699da0844939e0ftree | snapshot
parent89307babf966165171547f105e2253dec261cfa5commit | diff
parent0d098587cec70048336a3809bcde8044c7e9aa08commit | diff
Merge git://www.linux-watchdog.org/linux-watchdog

* git://www.linux-watchdog.org/linux-watchdog:
  watchdog: iTCO_wdt.c - problems with newer hardware due to SMI clearing (part 2)
  watchdog: hpwdt: Changes to handle NX secure bit in 32bit path
  watchdog: sp805: Fix section mismatch in ID table.
  watchdog: move coh901327 state holders
Linux kernel for KaRo TX COM modules