sync lpae/bone

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>