Merge tag 'davinci-for-v3.14/watchdog' of git://git.kernel.org/pub/scm/linux/kernel... drivers-for-linus
authorKevin Hilman <khilman@linaro.org>
Thu, 16 Jan 2014 21:59:44 +0000 (13:59 -0800)
committerKevin Hilman <khilman@linaro.org>
Thu, 16 Jan 2014 21:59:52 +0000 (13:59 -0800)
From Sekhar Nori:
This patch updates the davinci watchdog
platform device name from generic "watchdog"
to something more specific.

* tag 'davinci-for-v3.14/watchdog' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  watchdog: davinci: rename platform driver to davinci-wdt

Signed-off-by: Kevin Hilman <khilman@linaro.org>

Trivial merge