From: Kevin Hilman Date: Thu, 16 Jan 2014 21:59:44 +0000 (-0800) Subject: Merge tag 'davinci-for-v3.14/watchdog' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: Ubuntu-snapdragon-4.4.0-1029.32~9413^2 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=cd2f43a1f7400a74a084094502f70df2e169c6e8;p=mirror_ubuntu-zesty-kernel.git Merge tag 'davinci-for-v3.14/watchdog' of git://git.kernel.org/pub/scm/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 --- cd2f43a1f7400a74a084094502f70df2e169c6e8