diff options
| author | Linus Torvalds | 2011-04-07 11:31:03 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2011-04-07 11:31:03 -0700 |
| commit | ccfeef0ff76ebd632ae51bc56700f0072c4f1864 (patch) | |
| tree | 83ec5932dac631a455a69212b505f68f57f68cdf /arch | |
| parent | 42933bac11e811f02200c944d8562a15f8ec4ff0 (diff) | |
| parent | 6bef0b67474d71e0d6484cbabcc87657a1176d8d (diff) | |
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