summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx18/cx18-driver.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-30 01:50:49 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-30 01:50:49 +0200
commit33ae0cdd3eaba219e7c2f0647b6db4be540e2130 (patch)
tree1d0cb11644b40b500ad98e7af3bcac78012dec59 /drivers/media/video/cx18/cx18-driver.c
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo... (diff)
parent[IA64] Provide ACPI fixup for /proc/cpuinfo/physical_id (diff)
downloadlinux-33ae0cdd3eaba219e7c2f0647b6db4be540e2130.tar.xz
linux-33ae0cdd3eaba219e7c2f0647b6db4be540e2130.zip
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Provide ACPI fixup for /proc/cpuinfo/physical_id [IA64] Remove printk noise on unimplemented SAL_PHYSICAL_ID_INFO [IA64] allocate multiple contiguous pages via uncached allocator [IA64] bugfix: nptcg breaks cpu-hotadd
Diffstat (limited to 'drivers/media/video/cx18/cx18-driver.c')
0 files changed, 0 insertions, 0 deletions