Merge branch 'zerolen' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 12 Aug 2009 15:29:32 +0000 (08:29 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 12 Aug 2009 15:29:32 +0000 (08:29 -0700)
* 'zerolen' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
  Remove zero-length file drivers/mtd/maps/sbc8240.c


Trivial merge