merged kernel and dhd.ko from Cyanogenmod

Change-Id: Iba97263d7486f58fc79a9e09419c0c5a71f624d2