Merge branch 'zero-length' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 29 Jul 2009 19:30:54 +0000 (12:30 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 29 Jul 2009 19:30:54 +0000 (12:30 -0700)
commit7d4dd028b022ddf8631b4530ed8d7777526f545e
tree192942861c1804ae7a5f958b5a457adb17a836c2
parent2e13e5f03538cfded0c463fd60eddd0c8e2cd959
parent68dbcb726e372b3c8ef60b79b5aff4174dd2bdf0
Merge branch 'zero-length' of git://git./linux/kernel/git/jgarzik/misc-2.6

* 'zero-length' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
  Remove zero-length file drivers/char/vr41xx_giu.c