From: Linus Torvalds Date: Tue, 9 Sep 2008 18:52:12 +0000 (-0700) Subject: Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubifs-2.6 X-Git-Tag: v2.6.27-rc6~7 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b975dee3811ae0c58bd0e19cbd041cac8dd37ec5;p=linux-2.6-omap-h63xx.git Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubifs-2.6 * 'linux-next' of git://git.infradead.org/~dedekind/ubifs-2.6: UBIFS: make minimum fanout 3 UBIFS: fix division by zero UBIFS: amend f_fsid UBIFS: fill f_fsid UBIFS: improve statfs reporting even more UBIFS: introduce LEB overhead UBIFS: add forgotten gc_idx_lebs component UBIFS: fix assertion UBIFS: improve statfs reporting UBIFS: remove incorrect index space check UBIFS: push empty flash hack down UBIFS: do not update min_idx_lebs in stafs UBIFS: allow for racing between GC and TNC UBIFS: always read hashed-key nodes under TNC mutex UBIFS: fix zero-length truncations --- b975dee3811ae0c58bd0e19cbd041cac8dd37ec5