Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
[linux-2.6] / drivers / media / video / zr36120_mem.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2