summaryrefslogtreecommitdiff
path: root/drivers/watchdog/shwdt.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-11-15 16:41:21 (GMT)
committerArnd Bergmann <arnd@arndb.de>2012-11-15 16:41:21 (GMT)
commit8dbd2879e33be37adf40f747a5fb80ef1a6cd150 (patch)
treec688d7980be8c1c0dbf5e411caaf2c102120102e /drivers/watchdog/shwdt.c
parentb770ea523d95837e968d46c7fe09a3f5edd9bb27 (diff)
parentd308ba50a1234b299a00e63a95e61fdeb2f1a2df (diff)
downloadlinux-fsl-qoriq-8dbd2879e33be37adf40f747a5fb80ef1a6cd150.tar.xz
Merge branch 'omap/dt' into next/drivers
Needed for the omap timer changes. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/watchdog/shwdt.c')
0 files changed, 0 insertions, 0 deletions