Revert "fix reboot on shutdown"

This reverts commit cf219b07470d99642babcf3d09f2ec65941b4884.
Revert "disable more drivers"

This reverts commit 70b1fb53b7146325254df68847d94f59415b4f1c.
OMAP/DSS2: Disable devices that failed to resume.  Make multiple suspends and resume work correctly
Merge branch '2.6.32' of github.com:Quarx2k/jordan-kernel into 2.6.32