diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-22 13:14:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-22 13:14:37 -0800 |
| commit | 46fd906131bfae831b56a1e64dd94956626fc07c (patch) | |
| tree | 2c3992b6ffe0994498c468c9ef57eaad106969d6 /drivers/media/video/zoran.h | |
| parent | 39470bf24d93927bb27929b9f0d52ff5d608cfcb (diff) | |
| parent | ae9608af9e300395ec032479621f32688c121141 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6:
PCI: fix pci-driver kernel-doc
PCI: rework Documentation/pci.txt
PCI: Unhide the SMBus on the Asus P4P800-X
Diffstat (limited to 'drivers/media/video/zoran.h')
0 files changed, 0 insertions, 0 deletions