summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/Kconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2012-05-30 14:12:06 +0200
committerIngo Molnar <mingo@kernel.org>2012-05-30 14:12:06 +0200
commit403e1c5b7495d7b80fae9fc4d0a7a6f5abdc3307 (patch)
treec1f762dda525faf24aa10d6f81cf043da202c54f /drivers/watchdog/Kconfig
parentx86/mm/pat: Improve scaling of pat_pagerange_is_ram() (diff)
parentx86/mce: Fix 32-bit build (diff)
downloadlinux-403e1c5b7495d7b80fae9fc4d0a7a6f5abdc3307.tar.xz
linux-403e1c5b7495d7b80fae9fc4d0a7a6f5abdc3307.zip
Merge branch 'x86/mce' into x86/urgent
Merge in these fixlets. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/watchdog/Kconfig')
0 files changed, 0 insertions, 0 deletions