Merge tag 'davinci-for-v3.14/watchdog' of git://git.kernel.org/pub/scm/linux/kernel...
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)
commitcd2f43a1f7400a74a084094502f70df2e169c6e8
tree5c1d96e485f494c09b1b60c14e8c2d88e00cee33
parent64576e439709738c0f55ab60cdba0ad18d5aa24e
parent843748123d95ae77a489b41f2f193e8502fc7ea8
Merge tag 'davinci-for-v3.14/watchdog' of git://git./linux/kernel/git/nsekhar/linux-davinci into next/drivers

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>
arch/arm/mach-davinci/da830.c
arch/arm/mach-davinci/da850.c
arch/arm/mach-davinci/devices-da8xx.c
arch/arm/mach-davinci/dm355.c
arch/arm/mach-davinci/dm365.c
arch/arm/mach-davinci/dm644x.c
arch/arm/mach-davinci/dm646x.c