summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-04-07 18:31:03 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-07 18:31:03 (GMT)
commitccfeef0ff76ebd632ae51bc56700f0072c4f1864 (patch)
tree83ec5932dac631a455a69212b505f68f57f68cdf /arch
parent42933bac11e811f02200c944d8562a15f8ec4ff0 (diff)
parent6bef0b67474d71e0d6484cbabcc87657a1176d8d (diff)
downloadlinux-fsl-qoriq-ccfeef0ff76ebd632ae51bc56700f0072c4f1864.tar.xz
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
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions