From: Linus Torvalds Date: Fri, 15 Aug 2008 17:33:07 +0000 (-0700) Subject: Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubifs-2.6 X-Git-Tag: v3.12-rc1~18651 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=21d3bdb1606311a2900eabccfcb5a887952e2c44;p=kernel%2Fkernel-generic.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: (29 commits) UBIFS: xattr bugfixes UBIFS: remove unneeded check UBIFS: few commentary fixes UBIFS: fix budgeting request alignment in xattr code UBIFS: improve arguments checking in debugging messages UBIFS: always set i_generation to 0 UBIFS: correct spelling of "thrice". UBIFS: support splice_write UBIFS: minor tweaks in commit UBIFS: reserve more space for index UBIFS: print pid in dump function UBIFS: align inode data to eight UBIFS: improve budgeting checks UBIFS: correct orphan deletion order UBIFS: fix typos in comments UBIFS: do not union creat_sqnum and del_cmtno UBIFS: optimize deletions UBIFS: increment commit number earlier UBIFS: remove another unneeded function parameter UBIFS: remove unneeded function parameter ... --- 21d3bdb1606311a2900eabccfcb5a887952e2c44