diff options
| author | Kevin Hilman <khilman@linaro.org> | 2014-01-17 01:59:44 +0400 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2014-01-17 01:59:52 +0400 |
| commit | cd2f43a1f7400a74a084094502f70df2e169c6e8 (patch) | |
| tree | 5c1d96e485f494c09b1b60c14e8c2d88e00cee33 /drivers/parport/procfs.c | |
| parent | 64576e439709738c0f55ab60cdba0ad18d5aa24e (diff) | |
| parent | 843748123d95ae77a489b41f2f193e8502fc7ea8 (diff) | |
| download | linux-cd2f43a1f7400a74a084094502f70df2e169c6e8.tar.xz | |
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 <khilman@linaro.org>
Diffstat (limited to 'drivers/parport/procfs.c')
0 files changed, 0 insertions, 0 deletions