aboutsummaryrefslogtreecommitdiff
path: root/net/wanrouter
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-16 07:26:31 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-16 07:26:31 -0700
commit1c1ec9c03efce5853f75e244ff368339767f7b9e (patch)
treeb33168aa05d4376052a9652ce5044be00492d14b /net/wanrouter
parent1f829825f21755c48de075cd7722fcd19438f587 (diff)
parentaebaec975f30c4db40bb418fe9117bb6b4655b1b (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: [WATCHDOG] max63xx driver depends on ioremap() [WATCHDOG] max63xx: be careful when disabling the watchdog [WATCHDOG] fixed book E watchdog period register mask. [WATCHDOG] omap4: Fix WDT Kconfig
Diffstat (limited to 'net/wanrouter')
0 files changed, 0 insertions, 0 deletions