| commit | 9befb55ef51ad69dd67e279b0533d4cbc5e4c6c0 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Apr 21 12:30:07 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Apr 21 12:30:07 2010 -0700 |
| tree | 1270f24f89f10d832e879dd1352ef0209dd3aebe | |
| parent | a486b0af797e19ff79c6943cc8986111f2569fe8 [diff] | |
| parent | c7f2e1f0ac142a657a1de00d404e1c8345b20598 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6: jfs: add jfs specific ->setattr call jfs: fix diAllocExt error in resizing filesystem jfs_dmap.[ch]: trivial typo fix: s/heigth/height/g