Merge branch 'zero-len' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6

* 'zero-len' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6: drivers/media, include/media: delete zero-length files

Merge branch 'zero-len' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6
* 'zero-len' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6: drivers/media, include/media: delete zero-length files
478735e4 · Linus Torvalds · 0ef89d25 · 6f5fd8e9 · 0ef89d25 · 0ef89d25
5 changed file
--- a/drivers/media/video/planb.c
+++ b/drivers/media/video/planb.c
--- a/drivers/media/video/planb.h
+++ b/drivers/media/video/planb.h
--- a/drivers/media/video/saa7196.h
+++ b/drivers/media/video/saa7196.h
--- a/drivers/media/video/videodev.c
+++ b/drivers/media/video/videodev.c
--- a/include/media/audiochip.h
+++ b/include/media/audiochip.h