linux-next: manual merge of the trivial tree with the ext4 tree

Stephen Rothwell
2009-11-25T07:34:18Z

[-- Attachment #1: Type: text/plain, Size: 559 bytes --]

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
fs/ext4/balloc.c between commit 4433871130f36585fde38e7dd817433296648945
("ext4: fold ext4_free_blocks() and ext4_mb_free_blocks()") from the ext4
tree and commit 15dcf8433b514d1dc1b80d87a0798c2db2c37e95 ("tree-wide: fix
some typos and punctuation in comments") from the trivial tree.

The former moved the comment fixed by the latter and fixed the typo along
the way.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]