Merge branch 'batman-adv/next' of git://git.open-mesh.org/linux-merge
[pandora-kernel.git] / mm / memory_hotplug.c
Simple merge