From: Linus Torvalds Date: Thu, 24 Mar 2011 15:22:34 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6 X-Git-Tag: upstream/snapshot3+hdmi~10839 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fdc0ad80a4f27efcb457b49f5dd8455a3d623559;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6 * 'for-linus' of git://git.infradead.org/ubi-2.6: UBIFS: fix assertion warning and refine comments UBIFS: kill CONFIG_UBIFS_FS_DEBUG_CHKS UBIFS: use GFP_NOFS properly UBI: use GFP_NOFS properly --- fdc0ad80a4f27efcb457b49f5dd8455a3d623559