Update to kernel.org Linux 3.4.85

Merge branch 'kernel.org/linux-3.4.y'