Fix merge

This reverts the commit "Revert 'modified patch for cpu-freq.c by tpruvot for 2.6.32 to lower max
cpu speed and disable second core while screen is off'"

Change-Id: I3c95d9eab70ac3415406b9dff8a1e2a8ecd6e4eb
reverted to standby mode due to unbalanced vaudio mode and fix for skype mic issue (and probably whatsapp)
only working sampling rates for input
removing 16k sampling rate
restoring cpcap defaults + uv debugging for regulator
restoring cpcap defaults
double size of fb2 buffer (for hdmi support), add more uv settings to dvfs, add one clock setting, rise temp throttle to 70C
additional settings for dvfs on suspend
spi change for modem, clean up of earlysuspend, small change in wakeup routine for backlight
defconfig: re-enable bfq and row io-schedulers

And make ROW default again

Change-Id: I555fcd301a638be31e8904815f5b98b41749ef54
defconfig: go back to lagfree as default governor

Change-Id: I9112f7297a3d55b06857f9504d3d3f5d46ebf9df
defconfig: re-enable nfconntrack for ipv6

Change-Id: I458656f3f449a13131f6175eff38dadfab431c53
defconfig: enable bcm4329

Change-Id: I562ae26c72dc79fcc928cfffd5dc1e1fc9d7dfcc
reverted to standby mode due to unbalanced vaudio mode and fix for skype mic issue (and probably whatsapp)
only working sampling rates for input
removing 16k sampling rate
preparing for otg support
Revert "ARM: tegra: support multiple wake sources with same irq"

This reverts commit 48651d264bdb2ff90624e965b8a68b011077ca7c.

Conflicts:

	arch/arm/mach-tegra/pm-irq.c
Merge branch 'ics' of https://github.com/CyanogenMod-Atrix/android_kernel_motorola_olympus into ics
otg support enabled