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)
commit42c5c8435e8b7da4684607587d2c882d464cfc7d
tree033e72cc72ea018d9f982828230ef7ee231d5608
parent9256a2d0b1a36906656405adf564f03ab2d2f3e9
parent67fe0688082509c52bd451d10a61b3565169c23e
Merge branch 'zerolen' of git://git./linux/kernel/git/jgarzik/misc-2.6

* 'zerolen' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
  Remove zero-length file drivers/mtd/maps/sbc8240.c