summaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-03 02:58:52 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-03 02:58:52 +0100
commitbb648a0d22908116b4ef168935a160d7f17c4e6d (patch)
tree5ccb780a679433283ac7931d2bcbeb92828e443d /drivers/media/video
parent[netdrvr] tulip, de2104x: fix typo: s/__sparc_/__sparc__/ (diff)
parentlibata: add CONFIG_PM to libata core layer (diff)
downloadlinux-bb648a0d22908116b4ef168935a160d7f17c4e6d.tar.xz
linux-bb648a0d22908116b4ef168935a160d7f17c4e6d.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: add CONFIG_PM to libata core layer libata: add missing CONFIG_PM in LLDs libata: add missing PM callbacks pata_qdi: Fix initialisation [libata] pata_cmd64x: fix driver description in comments [libata] pata_{legacy,sc1200,sl82c105}: add missing hooks [libata] change master/slave IDENTIFY order libata-core: Fix simplex handling
Diffstat (limited to 'drivers/media/video')
0 files changed, 0 insertions, 0 deletions