Updates to general kernel infrastructure from 3.3 and 3.4

I should do less changes per commit

Change-Id: I7530b93f569536b282052ac903e91cdcee268b01