06b104
parent 0ef89d25d3e390dfa7c46772907951744a4067dc
parent 6f5fd8e9b98423add5f67b964e7cc8733dd73460
author Linus Torvalds <torvalds@linux-foundation.org> 1217620073 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1217620073 -0700

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
DU¨%™