tree b71dd11f3418eb8b729ec75f3873b58725e104d0
parent 8dba8f949492cf2ffb32c1c2fbfe12c3f53b1866
parent 17cf4442497cb2551eae1dedee638515db47c23e
author Linus Torvalds <torvalds@linux-foundation.org> 1269031320 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1269031320 -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:
  Delete zero-length file drivers/mtd/maps/omap_nor.c