Sync with recent changes at Nokia, include patches
from daniel.thomas@broadcom.com.
156 files changed