diff options
author | Olof Johansson | 2014-01-02 11:32:33 -0800 |
---|---|---|
committer | Olof Johansson | 2014-01-02 11:32:33 -0800 |
commit | 9dc9b8e51f95fce0cc3d50ef80402203d2dcd68a (patch) | |
tree | 1f98503a04cf6758a81f7945fd466aa668db1dc1 /drivers/watchdog/softdog.c | |
parent | c7fed591a6d5ce080482e4237bd02c99857c0d4f (diff) | |
parent | 70e123373c05e336f3f769b32c6132bdc2d6f5ac (diff) |
Merge tag 'mvebu-drivers-3.14-2' of git://git.infradead.org/linux-mvebu into next/drivers
From Jason Cooper:
mvebu driver changes for v3.14 (incremental #2)
- rtc
- add driver for Intersil ISL12057 chip
* tag 'mvebu-drivers-3.14-2' of git://git.infradead.org/linux-mvebu:
rtc: Add support for Intersil ISL12057 I2C RTC chip
b the commit.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/watchdog/softdog.c')
0 files changed, 0 insertions, 0 deletions