diff options
author | 2006-10-29 13:34:15 -0800 | |
---|---|---|
committer | 2006-10-29 13:34:15 -0800 | |
commit | e6c9f716ba91c1e065b75949f643383d1888bed5 (patch) | |
tree | 792131212ba9323283ea8541bcc440a71ae401f7 /drivers/acpi/container.c | |
parent | [PATCH] m68k: consolidate initcall sections (diff) | |
parent | ieee1394: ohci1394: revert fail on error in suspend (diff) | |
download | wireguard-linux-e6c9f716ba91c1e065b75949f643383d1888bed5.tar.xz wireguard-linux-e6c9f716ba91c1e065b75949f643383d1888bed5.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:
ieee1394: ohci1394: revert fail on error in suspend
Diffstat (limited to 'drivers/acpi/container.c')
0 files changed, 0 insertions, 0 deletions