ixp4xx: merge fixes and improvements from trunk