summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-19 21:42:00 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-19 21:42:00 +0100
commitcf3966bf6ecfe25a75d625771e327b84878bc09d (patch)
treeb71dd11f3418eb8b729ec75f3873b58725e104d0 /drivers
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 (diff)
parentDelete zero-length file drivers/mtd/maps/omap_nor.c (diff)
downloadlinux-cf3966bf6ecfe25a75d625771e327b84878bc09d.tar.xz
linux-cf3966bf6ecfe25a75d625771e327b84878bc09d.zip
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
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/maps/omap_nor.c0
1 files changed, 0 insertions, 0 deletions
diff --git a/drivers/mtd/maps/omap_nor.c b/drivers/mtd/maps/omap_nor.c
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/drivers/mtd/maps/omap_nor.c
+++ /dev/null