KozmiKKernel: Adding Build scripting
KozmiKKernel: Adding defconfig
drivers/media/common/tuners/xc4000: fix 'warning: '...' may be used uninitialized in this function'

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>
drivers/media/common/tuners/xc4000: initalize hw_major/minor and fw_major/minor

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>
fix: warning: 'sport' may be used uninitialized in this function

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>
fix: warning: 'dport' may be used uninitialized in this function

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>
fix: warning: 'saddr' may be used uninitialized in this function

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>
fix: warning: 'daddr' may be used uninitialized in this function

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>
fix: warning: 'protocol' may be used uninitialized in this function

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>
fix: warning: 'sport' may be used uninitialized in this function

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>
fix: warning: 'dport' may be used uninitialized in this function

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>
fix gcc4.7 compile

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>

Conflicts:

	arch/arm/boot/compressed/Makefile
Voltage Control: initial voltage control for MSM S4-Pro SOC

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

Conflicts:
	arch/arm/mach-msm/Kconfig

Conflicts:
	arch/arm/mach-msm/Kconfig
Voltage Control: add sysfs interface

Signed-off-by: faux123 <reioux@gmail.com>
Voltage Control: allow for lower minimums

this allows the low CPU frequencies to take advantage of UV control

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

Conflicts:
	arch/arm/mach-msm/lge/mako/board-mako-regulator.c
KozmiKKernel: Updating updater-script to flash boot.img in recovery
Add SIO I/O scheduler

Conflicts:
	block/Kconfig.iosched
	block/Makefile
KozmiKKernel: mach-msm: KozmiK OC

Conflicts:
	arch/arm/configs/kozmik_defconfig
	arch/arm/mach-msm/acpuclock-krait.c

Conflicts:
	arch/arm/mach-msm/Kconfig
	arch/arm/mach-msm/acpuclock-8064.c
	arch/arm/mach-msm/acpuclock-krait.c
mach-msm: Switching to using custom msm-config.h

Conflicts:
	arch/arm/mach-msm/acpuclock-8064.c

Conflicts:
	arch/arm/mach-msm/acpuclock-8064.c

Conflicts:
	arch/arm/mach-msm/acpuclock-8064.c

Conflicts:
	arch/arm/mach-msm/htc/m7/board-m7.c
mach-msm/cpufreq: set safe frequencies from config

Conflicts:
	arch/arm/mach-msm/cpufreq.c