diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-07 22:59:22 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-07 22:59:22 +0200 |
| commit | 4a2253313653bcc4126287818b676f95ac26dc09 (patch) | |
| tree | 380ac2af17e6e5ce7c68c942fe8df96fd6b92703 /drivers/watchdog/max63xx_wdt.c | |
| parent | Merge branch 'v4l_for_2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | Merge branches 'bugzilla-14337', 'bugzilla-14998', 'bugzilla-15407', 'bugzill... (diff) | |
| download | linux-4a2253313653bcc4126287818b676f95ac26dc09.tar.xz linux-4a2253313653bcc4126287818b676f95ac26dc09.zip | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
ACPI: sleep: init_set_sci_en_on_resume for Dell Studio 155x
ACPI: fix acpi_hest_firmware_first_pci() caused oops
sbshc: acpi_device_class "smbus_host_controller" too long
power_meter: acpi_device_class "power_meter_resource" too long
acpi_pad: "processor_aggregator" name too long
PNP: don't check for conflicts with bridge windows
ACPI: DMI init_set_sci_en_on_resume for multiple Lenovo ThinkPads
PNPACPI: compute Address Space length rather than using _LEN
ACPI: silence kmemcheck false positive
Diffstat (limited to 'drivers/watchdog/max63xx_wdt.c')
0 files changed, 0 insertions, 0 deletions