diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-28 21:13:13 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-28 21:13:13 +0200 |
commit | b4d32648c190711177a664af7d51149a8950555e (patch) | |
tree | 122bebbb0a1a150eee3e13a0f1689f1e8155f933 /drivers/watchdog/mtx-1_wdt.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jba... (diff) | |
parent | hwmon (coretemp): Fix build breakage if SMP is undefined (diff) | |
download | linux-b4d32648c190711177a664af7d51149a8950555e.tar.xz linux-b4d32648c190711177a664af7d51149a8950555e.zip |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
hwmon (coretemp): Fix build breakage if SMP is undefined
Diffstat (limited to 'drivers/watchdog/mtx-1_wdt.c')
0 files changed, 0 insertions, 0 deletions