Cleaning up all the merges
Defconfig: Updated 2.2.1