From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 7 Sep 2011 16:51:43 +0000 (-0700)
Subject: Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6 and git://git.infradea... 
X-Git-Tag: firefly_0821_release~3680^2~4524
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=54d6d5374491387eafe7f6e05e065232071cc4f0;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6 and git://git.infradead.org/ubi-2.6

* branch 'linux-next' of git://git.infradead.org/ubifs-2.6:
  UBIFS: not build debug messages with CONFIG_UBIFS_FS_DEBUG disabled

* branch 'linux-next' of git://git.infradead.org/ubi-2.6:
  UBI: do not link debug messages when debugging is disabled
---

54d6d5374491387eafe7f6e05e065232071cc4f0