Merge branch 'zero-len' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 1 Aug 2008 19:47:53 +0000 (12:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 1 Aug 2008 19:47:53 +0000 (12:47 -0700)
commit478735e42bfa047384afa72dceb408035532db20
treeede251ddac769e680422d32338e6e9d9de06b104
parent0ef89d25d3e390dfa7c46772907951744a4067dc
parent6f5fd8e9b98423add5f67b964e7cc8733dd73460
Merge branch 'zero-len' of git://git./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