]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'master' of ../linux-watchdog
authorWim Van Sebroeck <wim@iguana.be>
Thu, 27 Sep 2012 21:47:14 +0000 (23:47 +0200)
committerWim Van Sebroeck <wim@iguana.be>
Thu, 27 Sep 2012 21:47:14 +0000 (23:47 +0200)

Trivial merge