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

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

diff --git a/drivers/media/video/planb.c b/drivers/media/video/planb.c
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/drivers/media/video/planb.h b/drivers/media/video/planb.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/drivers/media/video/saa7196.h b/drivers/media/video/saa7196.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/include/media/audiochip.h b/include/media/audiochip.h
deleted file mode 100644 (file)
index e69de29..0000000