| commit | 63edbce160c6d68c806e58db026b5881c6010e04 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jun 29 10:30:31 2013 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jun 29 10:30:31 2013 -0700 |
| tree | 1ada31d631d1a8ccec9b4aa9956c54db90c6efcf | |
| parent | a61aef7fc00bac9068e98bf00aaa38e766f19a57 [diff] | |
| parent | 605c912bb843c024b1ed173dc427cd5c08e5d54d [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs Pull ubifs fixes from Al Viro: "A couple of ubifs readdir/lseek race fixes. Stable fodder, really nasty..." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: UBIFS: fix a horrid bug UBIFS: prepare to fix a horrid bug