diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-07 09:51:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-07 09:51:43 -0700 |
| commit | 54d6d5374491387eafe7f6e05e065232071cc4f0 (patch) | |
| tree | 3dbde7655ffe1cf95f3fa3592c342c9c77d2a013 /drivers | |
| parent | 4fc1d39e079e28a5daa2e6ffe6d27c064c7493ce (diff) | |
| parent | 016f1c54408b1e92e2e8087bfc05ca0a9c258513 (diff) | |
| parent | 9efabc84768ee8e79b50ad6ad6cff94d66da01f7 (diff) | |
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