From: Linus Torvalds Date: Fri, 9 Jan 2009 23:29:04 +0000 (-0800) Subject: Merge git://git.infradead.org/mtd-2.6 X-Git-Tag: v2.6.29-rc1~19 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=32b838b8cfa269d688889b3213e7ee37ee901f72;p=linux-2.6-omap-h63xx.git Merge git://git.infradead.org/mtd-2.6 * git://git.infradead.org/mtd-2.6: [JFFS2] remove junk prototypes --- 32b838b8cfa269d688889b3213e7ee37ee901f72