Fixes

Signed-off-by: Javelin <javelinanddart@gmail.com>
Merge branch 'lollipop' of github.com:javelinanddart/android_kernel_htc_ville into lollipop

Signed-off-by: Javelin <javelinanddart@gmail.com>

Conflicts:
	net/wireless/nl80211.c
Fix

Signed-off-by: Javelin <javelinanddart@gmail.com>