Revert "defconfig: r21"

This reverts commit 74f3682241dd4449a55dbd959d38620c9cd9613b.
Patch to 3.0.95 (gregkh)
defconfig: now we are at r21