security/selinux/hooks.c: fix build (reverted from commit 456d336b69c813f82a6d437d68703295600647d4)
bcmdhd: added pm and dtim controls, and decreased wakelock time

Conflicts:
	drivers/net/wireless/bcmdhd/dhd_linux.c