diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-02 18:57:26 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-02 18:57:26 -0500 |
| commit | 574c3fdae3890e60f8bc59e8107686944ba1e446 (patch) | |
| tree | 7c41ea5bff8ef69b0ba600b74980e590e3be17dd /drivers/w1/w1_family.h | |
| parent | 56635f7e6197404d7363f8dcaa7a97abf57276fb (diff) | |
| parent | f2863c54f30cccb50661697a6e4bdcd0ad0b0a6c (diff) | |
Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
* 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6:
UBI: fix checkpatch.pl warnings
UBI: simplify PEB protection code
UBI: prepare for protection tree improvements
UBI: return -ENOMEM upon failing vmalloc
UBI: document UBI ioctls
UBI: handle write errors in WL worker
UBI: fix error path
UBI: some code re-structuring
UBI: fix deadlock
UBI: fix warnings when debugging is enabled
Diffstat (limited to 'drivers/w1/w1_family.h')
0 files changed, 0 insertions, 0 deletions