diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-10 14:38:15 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-10 14:38:15 -0700 |
commit | e032d93e1a3b2facf17029a643faf141dcea5f70 (patch) | |
tree | 892f9ea8fd55ee6445a2840bcebde1c3e15a4d4a /arch/m32r | |
parent | b1a8d700e7fdf1bc44000e3edc24cc43f904df50 (diff) | |
parent | 5511142870046a7bed947d51ec9b320856ee120a (diff) |
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 'arch/m32r')
0 files changed, 0 insertions, 0 deletions