nicklovell23@slimbuild:~/slim/kernel/samsung/d2$ git pull ssh://nicklovell23@grapefruit.slimroms.net:29299/SlimRoms/kernel_samsung_d2 refs/changes/17/31517/1
remote: Counting objects: 57, done
remote: Finding sources: 100% (33/33)
remote: Total 33 (delta 7), reused 15 (delta 7)
Unpacking objects: 100% (33/33), done.
From ssh://grapefruit.slimroms.net:29299/SlimRoms/kernel_samsung_d2
 * branch            refs/changes/17/31517/1 -> FETCH_HEAD
Merge made by the 'recursive' strategy.
 Makefile                               |    6 +-
 arch/arm/configs/cyanogen_d2_defconfig |    9 +-
 arch/arm/mach-msm/acpuclock-8960.c     |   18 +-
 arch/arm/mach-msm/clock-8960.c         |    2 +-
 drivers/cpufreq/Kconfig                |   39 ++
 drivers/cpufreq/Makefile               |    4 +
 drivers/cpufreq/cpufreq_asswax.c       |  945 ++++++++++++++++++++++++++++++++++++++++++++++++
 drivers/cpufreq/cpufreq_dancedance.c   |  650 +++++++++++++++++++++++++++++++++
 drivers/cpufreq/cpufreq_lulzactive.c   | 1014 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 drivers/cpufreq/cpufreq_wheatley.c     |  839 +++++++++++++++++++++++++++++++++++++++++++
 include/asm-generic/cputime.h          |    2 +
 sound/soc/codecs/Kconfig               |    6 +
 sound/soc/codecs/Makefile              |    2 +
 sound/soc/codecs/sound_control_gpl.c   |  275 ++++++++++++++
 sound/soc/codecs/wcd9310.c             |    6 +
 15 files changed, 3805 insertions(+), 12 deletions(-)
 create mode 100644 drivers/cpufreq/cpufreq_asswax.c
 create mode 100644 drivers/cpufreq/cpufreq_dancedance.c
 create mode 100644 drivers/cpufreq/cpufreq_lulzactive.c
 create mode 100644 drivers/cpufreq/cpufreq_wheatley.c
 create mode 100644 sound/soc/codecs/sound_control_gpl.c