summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx18/cx18-queue.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-07-07 17:26:41 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-07-07 17:26:41 +0200
commit66ee156078697cdc013d46aed3b2fee445c325a1 (patch)
treecdff6539fa339d4bdf11934778dd93f3c3225dad /drivers/media/video/cx18/cx18-queue.c
parentMerge branch 'fb' into devel (diff)
parentMerge branch 'atags' into for-rmk (diff)
parent[ARM] mach-types update (diff)
downloadlinux-66ee156078697cdc013d46aed3b2fee445c325a1.tar.xz
linux-66ee156078697cdc013d46aed3b2fee445c325a1.zip
Merge branches 'ns9x' and 'machtypes' into devel