From: Linus Torvalds Date: Fri, 18 Mar 2011 17:50:27 +0000 (-0700) Subject: Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6 X-Git-Tag: v2.6.39-rc1~421 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8f627a8a881481598c2591c3acc122fb9be7bac4;p=platform%2Fupstream%2Fkernel-adaptation-pc.git Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6 * 'linux-next' of git://git.infradead.org/ubifs-2.6: (25 commits) UBIFS: clean-up commentaries UBIFS: save 128KiB or more RAM UBIFS: allocate orphans scan buffer on demand UBIFS: allocate lpt dump buffer on demand UBIFS: allocate ltab checking buffer on demand UBIFS: allocate scanning buffer on demand UBIFS: allocate dump buffer on demand UBIFS: do not check data crc by default UBIFS: simplify UBIFS Kconfig menu UBIFS: print max. index node size UBIFS: handle allocation failures in UBIFS write path UBIFS: use max_write_size during recovery UBIFS: use max_write_size for write-buffers UBIFS: introduce write-buffer size field UBI: incorporate LEB offset information UBIFS: incorporate maximum write size UBI: provide LEB offset information UBI: incorporate maximum write size UBIFS: fix LEB number in printk UBIFS: restrict world-writable debugfs files ... --- 8f627a8a881481598c2591c3acc122fb9be7bac4