WiFi toggle fix

Conflicts:
	drivers/net/wireless/bcmdhd/Makefile
Revert "WiFi toggle fix"

This reverts commit 0821320c5db7dbfa570c2d4f590ba0300a604b48.
add missing *.s files
WiFi toggle fix

Conflicts:
	drivers/net/wireless/bcmdhd/Makefile
power: don't wait for timeout if sys_sync completes early
lowmemorykiller updates

staging: android/lowmemorykiller: Don't grab tasklist_lock

staging: android/lowmemorykiller: Better mm handling

staging: android/lowmemorykiller: No need for task->signal check

staging: android/lowmemorykiller: Do not kill kernel threads

staging: android: lowmemorykiller: skip already freed memory

Conflicts:
	drivers/staging/android/lowmemorykiller.c
gitignore update
update BFQ to v7r5

Revert "block: remove aliased requests from BFQ"
Revert "block, bfq: add Early Queue Merge (EQM) to BFQ-v7r3 for 3.0.0"
Revert "block: introduce the BFQ-v7r3 I/O sched for 3.0"
Revert "block: cgroups, kconfig, build bits for BFQ-v7r3-3.0"
Revert "block: prepare I/O context code for BFQ-v7r3 for 3.0"
block: prepare I/O context code for BFQ-v7r5 for 3.0
block: cgroups, kconfig, build bits for BFQ-v7r5-3.0
block: introduce the BFQ-v7r5 I/O sched for 3.0
block, bfq: add Early Queue Merge (EQM) to BFQ-v7r5 for 3.0.0
block: remove aliased requests from BFQ

Change-Id: I2880caa842a12cf532f4526c4d0896e4c249098e

Conflicts:
	block/bfq-cgroup.c
	block/bfq-iosched.c
	block/bfq-sched.c
	block/bfq.h
	include/linux/cgroup_subsys.h
	include/linux/iocontext.h
gitignore part 2
defconfig
bfq compiling fix
defconfig update
Merge branch 'wip'