diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-17 12:47:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-17 12:47:47 -0700 |
| commit | a6b52a9db891e2a39e8a0fed6005935d8b1aa59c (patch) | |
| tree | 3fbef9df274667d1e96894c2b8c373b7192cfaf1 /drivers/media/video/cx23885/cx23885-core.c | |
| parent | 247dc220f410969b35f884f1554fe9b78119dd59 (diff) | |
| parent | 7fb574a97f7147610c44cef55d0cde2409392a80 (diff) | |
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: Fixes device power states array overflow
ACPI, APEI, HEST, Detect duplicated hardware error source ID
ACPI: Fix lockdep false positives in acpi_power_off()
Diffstat (limited to 'drivers/media/video/cx23885/cx23885-core.c')
0 files changed, 0 insertions, 0 deletions