aboutsummaryrefslogtreecommitdiff
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-03-15 16:27:01 +0000
committerArnd Bergmann <arnd@arndb.de>2012-03-15 16:27:01 +0000
commit5dab643cd67e1a791052d092ab447534937bf3f1 (patch)
treef4132309d27fd59327f0e7c2d524a84e99b9913e /drivers/watchdog
parent065319c229c76ded943a8a7cf55e1e6e1e55ae69 (diff)
parent25af2d9f85750bb129eb224b7b3a07d3c93d282d (diff)
Merge tag 'imx35-cam-fb' of git://git.pengutronix.de/git/imx/linux-2.6 into next/boards
* tag 'imx35-cam-fb' of git://git.pengutronix.de/git/imx/linux-2.6: i.MX35-PDK: Add Camera support ARM : mx35: 3ds-board: add framebuffer device
Diffstat (limited to 'drivers/watchdog')
0 files changed, 0 insertions, 0 deletions