]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 94f8c66 1cc7724)
Merge watchdog driver updates
authorLinus Torvalds <torvalds@evo.osdl.org>
Mon, 5 Sep 2005 13:00:45 +0000 (06:00 -0700)
committerLinus Torvalds <torvalds@evo.osdl.org>
Mon, 5 Sep 2005 13:00:45 +0000 (06:00 -0700)
commit67d2c36e901403bb97cb79ddb44d702c3284d0ba
tree872805a9402f8186584075f1a8cf804b9606efeatree | snapshot
parent94f8c66e5e543d79231abf203d6e514ecb668688commit | diff
parent1cc77248106aafc12ba529953f652d6f8db2c84dcommit | diff
Merge watchdog driver updates

Automated merge from

master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

failed due to duplicate different changes to Kconfig file. Manually fixed
up. Hopefully.
drivers/char/watchdog/Makefile diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.