Revert "fixes merging errors"

This reverts commit c1ac8cf2132daebd664d324064f961f1996930bf.
Revert "Merge branch 'linux-3.0.y' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into rs-dev"

This reverts commit 7aa54b9b8f40d2242e03fd3c65a383c6c1a665d6, reversing
changes made to 94853cddc139d02daad238cbafdd2f390e2fa8ef.
Linux 3.0.83