| commit | 9a7c6b73c40e916861eb852dc5855ffb3d58a3cd | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jun 28 11:41:43 2012 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jun 28 11:41:43 2012 -0700 |
| tree | fff050488cb58ff8540e41f29bbcb1c487220c14 | |
| parent | 4a9c46978d9a7e8f2b41f757eb24bd190b1a3b7b [diff] | |
| parent | 903e0e4ef9120c3d7693599acb95e76e8263fb35 [diff] |
Merge tag 'upstream-3.5-rc5' of git://git.infradead.org/linux-ubifs Pull ubi/ubifs fixes from Artem Bityutskiy: "Fix the debugfs regression - we never enable it because incorrect 'IS_ENABLED()' macro usage: should be 'IS_ENABLED(CONFIG_DEBUG_FS)', but we had 'IS_ENABLED(DEBUG_FS)'. Also fix incorrect assertion." * tag 'upstream-3.5-rc5' of git://git.infradead.org/linux-ubifs: UBI: correct usage of IS_ENABLED() UBIFS: correct usage of IS_ENABLED() UBIFS: fix assertion