diff options
author | 2007-09-10 14:38:15 -0700 | |
---|---|---|
committer | 2007-09-10 14:38:15 -0700 | |
commit | e032d93e1a3b2facf17029a643faf141dcea5f70 (patch) | |
tree | 892f9ea8fd55ee6445a2840bcebde1c3e15a4d4a /drivers/acpi/debug.c | |
parent | Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev (diff) | |
parent | firewire: fw-ohci: ignore failure of pci_set_power_state (fix suspend regression) (diff) | |
download | linux-dev-e032d93e1a3b2facf17029a643faf141dcea5f70.tar.xz linux-dev-e032d93e1a3b2facf17029a643faf141dcea5f70.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
firewire: fw-ohci: ignore failure of pci_set_power_state (fix suspend regression)
Diffstat (limited to 'drivers/acpi/debug.c')
0 files changed, 0 insertions, 0 deletions