Fix db8500-prcmu.c: Fix error <<<<HEAD

Change-Id: I2dce39c3faa7a9443df9fdce8243291097a56e97
Fix net/mac80211/main.c: removing last update for this single file caused by bb86a386df98a07479f71d845e63335fc4a5bf92

Change-Id: If6d7e71f85aeab0acf2b860abdd21a525ede25da