projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0160f53 c315b7e)
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 13 Sep 2005 16:45:20 +0000 (09:45 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 13 Sep 2005 16:45:20 +0000 (09:45 -0700)
1  2 
drivers/char/watchdog/Kconfig patch | diff1 | diff2 | blob | history
drivers/char/watchdog/Makefile patch | diff1 | diff2 | blob | history

diff --cc drivers/char/watchdog/Kconfig
Simple merge
diff --cc drivers/char/watchdog/Makefile
Simple merge
John Crispins staging tree