diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-24 11:32:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-24 11:32:12 -0700 |
| commit | 383bee6b54a1eeac3a286812be8a5c3f122fd834 (patch) | |
| tree | 4949f9d94bb61182b0828a96bc86191eb28f6c99 /drivers/media/video/au0828/au0828-dvb.c | |
| parent | b39c8be6d5e38f4478be0c7aaf1d3a160a4dd330 (diff) | |
| parent | cc2893b6af5265baa1d68b17b136cffca9e40cfa (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
PCI: Ensure we re-enable devices on resume
x86/PCI: parse additional host bridge window resource types
PCI: revert broken device warning
PCI aerdrv: use correct bit defines and add 2ms delay to aer_root_reset
x86/PCI: ignore Consumer/Producer bit in ACPI window descriptions
Diffstat (limited to 'drivers/media/video/au0828/au0828-dvb.c')
0 files changed, 0 insertions, 0 deletions