merged changes from the no bcm4329 defconfig