Merge: stable/linux-3.2.y ixp4xx-3.0 ixp4xx-local-3.2 router-3.2