diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-29 07:47:44 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-29 07:47:44 +0200 |
| commit | dc710afe95ee9b263ab593c11d86a684f1606872 (patch) | |
| tree | 2b4ea32bed1a010a3046069dd834f62bc071c92c /drivers/media/video/vino.h | |
| parent | Merge branch 'upstream' of git://electric-eye.fr.zoreil.com/home/romieu/linux... (diff) | |
| parent | Merge branch 'master' into upstream-fixes (diff) | |
| download | linux-dc710afe95ee9b263ab593c11d86a684f1606872.tar.xz linux-dc710afe95ee9b263ab593c11d86a684f1606872.zip | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
[libata] sata_promise: comment out duplicate PCI ID
[PATCH] libata: improve EH action and EHI flag handling
[PATCH] libata: fix eh_skip_recovery condition
[PATCH] libata: fix autopsy ehc->i.action and ehc->i.dev handling
Diffstat (limited to 'drivers/media/video/vino.h')
0 files changed, 0 insertions, 0 deletions