Merge all devices into one defconfig

Apperently the hitachi driver works on the novatek screen,
so why not merge them!

Change-Id: I243e7aa6adff2b15937cdfffa5a08ae929252aad
Signed-off-by: Rashed Abdel-Tawab <rashedabdeltawab@gmail.com>

Conflicts:

	arch/arm/configs/cyanogenmod_p505_p506_defconfig