linux-next: manual merge of the akpm tree with the arm tree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in mm/vmalloc.c
between commit be9b7335e706 ("mm: add vm_area_add_early()") from the arm
tree and commit "mm: add vm_area_add_early()" from the akpm tree.

These are clearly meant to be the same patch, so I dropped the version
from the akpm tree.  (The arm version has a "BUG_ON(vmap_initialized);"
at the start of vm_area_add_early()).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature