fix merge conflict
[BFS] Refine locality to ranking and siblings/cache idle code.
[BFS] locality doesn't need to be kmalloc.
[BFS] Sync up try_to_wake_up* functions
[BFS] Add WARN_ON_ONCE if rq is dereferenced in wait_task_inactive()
[BFS] Remove runqueue wake_list.

The runqueue wake_list is used in ttwu_queue_remote(). In BFS,
tasks are just put into grq, so wake_list is no needed.
Merge branch 'ck-3.15' into pf-3.15
configs-3.15: update dell-vostro-3360.config
Merge branch 'configs-3.15' into pf-3.15
Merge remote-tracking branch 'upstream/pf-3.15' into pf-3.15

Conflicts:
	Makefile