diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-22 14:52:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-22 14:52:00 -0800 |
| commit | c47a75a45fa3a9d98b61f7e31983ffab2c44404f (patch) | |
| tree | 4a2a469886fd401648334312018fade9ae98e063 /net/unix/af_unix.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 (diff) | |
| parent | ACPI: don't cond_resched() when irqs_disabled() (diff) | |
| download | linux-dev-c47a75a45fa3a9d98b61f7e31983ffab2c44404f.tar.xz linux-dev-c47a75a45fa3a9d98b61f7e31983ffab2c44404f.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: don't cond_resched() when irqs_disabled()
ACPI: fix 2.6.28 acpi.debug_level regression
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions