Merge branch 'zerolen' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Mar 2010 20:42:00 +0000 (13:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Mar 2010 20:42:00 +0000 (13:42 -0700)
commitcf3966bf6ecfe25a75d625771e327b84878bc09d
treeb71dd11f3418eb8b729ec75f3873b58725e104d0
parent8dba8f949492cf2ffb32c1c2fbfe12c3f53b1866
parent17cf4442497cb2551eae1dedee638515db47c23e
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:
  Delete zero-length file drivers/mtd/maps/omap_nor.c