diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-13 17:58:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-13 17:58:54 -0700 |
| commit | 7ec3fa1f4a5c4f9cc3d72983bfd8ac87cae356ab (patch) | |
| tree | cd9dc3433846e59559666b6f5c022a27fc036607 /fs/cifs/file.c | |
| parent | 9a459f6812fc26e0eb24bbe9c388000e23f67f6b (diff) | |
| parent | 86ded1f35df32ad795cfc8cc1bdaeffbcaec0d5f (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: hpwdt (12/12): Make NMI decoding a compile-time option
watchdog: hpwdt (11/12): move NMI-decoding init and exit to seperate functions
watchdog: hpwdt (10/12): Use "decoding" instead of "sourcing"
watchdog: hpwdt (9/12): hpwdt_pretimeout reorganization
watchdog: hpwdt (8/12): implement WDIOC_GETTIMELEFT
watchdog: hpwdt (7/12): allow full range of timer values supported by hardware
watchdog: hpwdt (6/12): Introduce SECS_TO_TICKS() macro
watchdog: hpwdt (5/12): Make x86 assembly ifdef guard more strict
watchdog: hpwdt (4/12): Despecificate driver from iLO2
watchdog: hpwdt (3/12): Group NMI sourcing specific items together
watchdog: hpwdt (2/12): Group options that affect watchdog behavior together
watchdog: hpwdt (1/12): clean-up include-files.
Diffstat (limited to 'fs/cifs/file.c')
0 files changed, 0 insertions, 0 deletions