From: Linus Torvalds Date: Wed, 12 Aug 2009 15:29:32 +0000 (-0700) Subject: Merge branch 'zerolen' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6 X-Git-Tag: firefly_0821_release~13174 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=42c5c8435e8b7da4684607587d2c882d464cfc7d;p=firefly-linux-kernel-4.4.55.git 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: Remove zero-length file drivers/mtd/maps/sbc8240.c --- 42c5c8435e8b7da4684607587d2c882d464cfc7d