tree 66e32023119cc3776a874043b7ef18c05cde32dc
parent e6d133618836f317f5a2be657f768e56552b9419
parent f1f5bda4e9726456bd132e738bf60b727856477e
author Linus Torvalds <torvalds@linux-foundation.org> 1277649500 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1277649500 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  watchdog: at32ap700x_wdt: register misc device last in probe() function
  watchdog: [PATCH 3/3] imx2_wdt: fix section mismatch