Squash Linux 3.4.1-10

Linux 3.4.1

Linux 3.4.2

Conflicts:
	fs/ext4/mballoc.c
	fs/ext4/namei.c

Linux 3.4.3

Linux 3.4.4

Linux 3.4.5

Linux 3.4.6

Linux 3.4.7

Conflicts:
	mm/vmscan.c

Linux 3.4.8

Conflicts:
	fs/ext4/extents.c
	fs/ext4/super.c

Linux 3.4.9

Linux 3.4.10
Squash Linux 3.4.11-20

Linux 3.4.11

Linux 3.4.12

Conflicts:
	arch/arm/include/asm/mutex.h
	mm/vmscan.c

Linux 3.4.13

Linux 3.4.14

Linux 3.4.15

Linux 3.4.16

Linux 3.4.17

Linux 3.4.18

Linux 3.4.19

Linux 3.4.20
Squash Linux 3.4.21-30

Linux 3.4.21

Linux 3.4.22

Linux 3.4.23

Linux 3.4.24

Linux 3.4.25

Conflicts:
	include/linux/freezer.h

Linux 3.4.26

Linux 3.4.27

Linux 3.4.28

Linux 3.4.29

Conflicts:
	arch/arm/mm/dma-mapping.c

Linux 3.4.30
Squash Linux 3.4.31-40

Linux 3.4.31

Linux 3.4.32

Linux 3.4.33

Linux 3.4.34

Linux 3.4.35

Linux 3.4.36

Linux 3.4.37

Linux 3.4.38

Linux 3.4.39

Linux 3.4.40
Squash Linux 3.4.41-50

Linux 3.4.41

Linux 3.4.42

Conflicts:
	kernel/sched/core.c

Linux 3.4.43

Linux 3.4.44

Linux 3.4.45

Linux 3.4.46

Linux 3.4.47

Linux 3.4.48

Linux 3.4.49

Linux 3.4.50

Fix up some mis-merges from Linux merge
Squash Linux 3.4.51-60

Linux 3.4.51

Linux 3.4.52

Linux 3.4.53

Linux 3.4.54

Linux 3.4.55

Linux 3.4.56

Linux 3.4.57

Linux 3.4.58

Linux 3.4.59

Conflicts:
	kernel/futex.c

Linux 3.4.60

Conflicts:
	kernel/workqueue.c
Squash Linux 3.4.61-70

Linux 3.4.61

Linux 3.4.62

Linux 3.4.63

Linux 3.4.64

Linux 3.4.65

Linux 3.4.66

Linux 3.4.67

Linux 3.4.68

Linux 3.4.69

Linux 3.4.70
Squash Linux 3.4.71-80

Linux 3.4.71

Linux 3.4.72

Linux 3.4.73

Conflicts:
	block/elevator.c

Linux 3.4.74

Linux 3.4.75

Linux 3.4.76

Linux 3.4.77

Conflicts:
	arch/arm/kernel/traps.c
	drivers/net/ethernet/broadcom/tg3.c

Linux 3.4.78

Linux 3.4.79

Linux 3.4.80
Squash Linux 3.4.81-83

Linux 3.4.81

Linux 3.4.82

Linux 3.4.83

Conflicts:
	arch/arm/mm/proc-v7.S
	mm/memory_hotplug.c
	mm/vmscan.c

Conflicts:
	mm/memory_hotplug.c
Linux 3.4.84
Linux 3.4.85

fs: remove some dmesg logspam from Linux mainline 3.4
Linux 3.4.86
Linux 3.4.87
Performance tweak
Squash I/O scheduler additions and rename defconfig

Add Fifo Iosched

* Let's give this a try!

Signed Off By: Chester Kener <Cl3Kener@gmail.com>

Conflicts:
	arch/arm/configs/cyanogenmod_hercules_defconfig
	block/Kconfig.iosched
	block/Makefile

Add bfq io scheduler

Rename defconfig...we aren't CM

Whoops, forgot to add this little guy to my defconfig

Add IO Schedulers

Conflicts:
	arch/arm/configs/cyanogenmod_hercules_defconfig
	block/Kconfig.iosched
	block/Makefile

Tripndroid IO

https://github.com/tommytarts/quantumkernel/commit/6dc57f8a3f6ea16aa805413eeccabf2c57982928

Conflicts:
	block/Kconfig.iosched
	block/Makefile
cpufreq: intelliactive: initial coding and introduction!

intelliactive is based on Latest Google Interactive cpufreq governor from
Google.  The original Interactive provides smooth UI operations but suffers
slight battery drain due to its aggressive policies.  Intelliactive is an
improvement built on top of it.

It has the following enhancements added:
1. self-boost capability from input drivers (no need for PowerHAL assist)
2. two phase scheduling (idle/busy phases to prevent from jumping directly to
   max freq
3. Checks for offline cpus and short circuits some unnecessary checks to
   improve code execution paths
4. removed trace calls

Signed-off-by: Paul Reioux <reioux@gmail.com>

intelliactive: tune for APQ8064 devices

Signed-off-by: Paul Reioux <reioux@gmail.com>
Remove msm governor
Add abyssplug, adaptive, nightmare, smartassH3, and wheatley governors

Conflicts:
	arch/arm/configs/poke_defconfig
Add asswax, badass, and dancedance governors and
set Intelliactive as default gov

Conflicts:
	arch/arm/configs/poke_defconfig
Add fast charge from S3 + droidroidz otg patch

Conflicts:
	arch/arm/mach-msm/Makefile