tree 033e72cc72ea018d9f982828230ef7ee231d5608
parent 9256a2d0b1a36906656405adf564f03ab2d2f3e9
parent 67fe0688082509c52bd451d10a61b3565169c23e
author Linus Torvalds <torvalds@linux-foundation.org> 1250090972 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1250090972 -0700

Merge branch 'zerolen' of git://git.kernel.org/pub/scm/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