| commit | a520458fccc5f5dd4d0ed63c0602db2fd3172b21 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jan 15 11:25:41 2012 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jan 15 11:25:41 2012 -0800 |
| tree | 3bca2be919eac0bfb50bd0623cda6df589260de8 | |
| parent | c49c41a4134679cecb77362e7f6b59acb6320aa7 [diff] | |
| parent | 1f4f43475f1295dc41c18684e59deea9b6d46045 [diff] |
Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6 * 'linux-next' of git://git.infradead.org/ubifs-2.6: UBI: use own macros for the layout volume UBI: fix nameless volumes handling UBIFS: fix non-debug configuration build