]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'generic-watchdog' into linux-next
authorWim Van Sebroeck <wim@iguana.be>
Sun, 16 Oct 2011 21:06:35 +0000 (23:06 +0200)
committerWim Van Sebroeck <wim@iguana.be>
Sun, 16 Oct 2011 21:06:35 +0000 (23:06 +0200)

Trivial merge