diff options
author | 2007-08-25 11:24:53 -0700 | |
---|---|---|
committer | 2007-08-25 11:24:53 -0700 | |
commit | f2154eef2a926435cdf79156cd361092d6cba91e (patch) | |
tree | bc92864fd906158d65f8792af2e166dd68fa4a50 /drivers/acpi/debug.c | |
parent | Merge branch 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6 (diff) | |
parent | firewire: Add ref-counting for sbp2 orbs (fix command abortion) (diff) | |
download | linux-dev-f2154eef2a926435cdf79156cd361092d6cba91e.tar.xz linux-dev-f2154eef2a926435cdf79156cd361092d6cba91e.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: Add ref-counting for sbp2 orbs (fix command abortion)
firewire: fix unloading of fw-ohci while devices are attached
ieee1394: sbp2: fix sbp2_remove_device for error cases
Diffstat (limited to 'drivers/acpi/debug.c')
0 files changed, 0 insertions, 0 deletions