From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 7 Apr 2011 18:31:03 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.infradead.org/ubifs-2.6
X-Git-Tag: MMI-PSA29.97-13-9~20004
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ccfeef0ff76ebd632ae51bc56700f0072c4f1864;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'for-linus' of git://git.infradead.org/ubifs-2.6

* 'for-linus' of git://git.infradead.org/ubifs-2.6:
  UBI: do not select KALLSYMS_ALL
  UBI: do not compare array with NULL
  UBI: check if we are in RO mode in the erase routine
  UBIFS: fix debugging failure in dbg_check_space_info
  UBIFS: fix error path in dbg_debugfs_init_fs
  UBIFS: unify error path dbg_debugfs_init_fs
  UBIFS: do not select KALLSYMS_ALL
  UBIFS: fix assertion warnings
  UBIFS: fix oops on error path in read_pnode
  UBIFS: do not read flash unnecessarily
---

ccfeef0ff76ebd632ae51bc56700f0072c4f1864