Merge with Linux 2.5.56.