From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 19 Mar 2010 20:42:00 +0000 (-0700)
Subject: Merge branch 'zerolen' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6
X-Git-Tag: Ubuntu-5.2.0-15.16~25601
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=cf3966bf6ecfe25a75d625771e327b84878bc09d;p=mirror_ubuntu-eoan-kernel.git

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
---

cf3966bf6ecfe25a75d625771e327b84878bc09d