| commit | af8a927c8bdea82cf220e0b720d64daaf073a969 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 15 11:03:49 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 15 11:03:49 2011 -0700 |
| tree | 97411751db099ab0c2022d0699e6f9df9aef2e3a | |
| parent | 3110df800c4de2724624d46e6bed27efc5e9a707 [diff] | |
| parent | 3a36199114de0e60984534776732e0a7a220e29e [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2: nilfs2: remove resize from unsupported features list