| commit | 4d429480352c63db2228489f0db9fd381cdc3c9c | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue May 24 11:51:26 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue May 24 11:51:26 2011 -0700 |
| tree | 96a3bc976735ef01d5d5e42353ae1dd795d34370 | |
| parent | eb08d8ff476ad39a149e1044c7d3fd742a168864 [diff] | |
| parent | ab50ff684707031ed4bad2fdd313208ae392e5bb [diff] |
Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6 * 'linux-next' of git://git.infradead.org/ubi-2.6: UBI: switch to dynamic printks UBI: turn some macros into static inline UBI: improve checking in debugging prints UBI: fix typo in a message UBI: fix minor stylistic issues UBI: use __packed instead of __attribute__((packed)) UBI: cleanup comments around volume properties UBI: re-name set volume properties ioctl UBI: make the control character device non-seekable