projects / platform / adaptation / renesas_rcar / renesas_kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 64576e4 8437481)
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)
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>
1  2 
arch/arm/mach-davinci/da830.c patch | diff1 | diff2 | blob | history
arch/arm/mach-davinci/da850.c patch | diff1 | diff2 | blob | history
arch/arm/mach-davinci/devices-da8xx.c patch | diff1 | diff2 | blob | history
arch/arm/mach-davinci/dm355.c patch | diff1 | diff2 | blob | history
arch/arm/mach-davinci/dm365.c patch | diff1 | diff2 | blob | history
arch/arm/mach-davinci/dm644x.c patch | diff1 | diff2 | blob | history
arch/arm/mach-davinci/dm646x.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mach-davinci/da830.c
Simple merge
diff --cc arch/arm/mach-davinci/da850.c
Simple merge
diff --cc arch/arm/mach-davinci/devices-da8xx.c
Simple merge
diff --cc arch/arm/mach-davinci/dm355.c
Simple merge
diff --cc arch/arm/mach-davinci/dm365.c
Simple merge
diff --cc arch/arm/mach-davinci/dm644x.c
Simple merge
diff --cc arch/arm/mach-davinci/dm646x.c
Simple merge
Domain: System / Uncategorized;