Merge branches 'refs/heads/ib-from-asoc-3.16', 'refs/heads/ib-from-pm-3.16', 'refs...

diff --cc drivers/cpufreq/longhaul.c
index 5c4369b5d834d93f05095cf6052848ec2d2ddec4,d00e5d1abd258b469bf48862a5f14b08e04f97a7,f4024d4d35345b3a8f9f7a046a06ed4ea5d3e428,d00e5d1abd258b469bf48862a5f14b08e04f97a7,d00e5d1abd258b469bf48862a5f14b08e04f97a7,5c4369b5d834d93f05095cf6052848ec2d2ddec4,d00e5d1abd258b469bf48862a5f14b08e04f97a7,45bafddfd8ea488ba24362b44a8aa58bf58304eb,d00e5d1abd258b469bf48862a5f14b08e04f97a7..c913906a719ee0f9b44598593b4900c201395596
--- 1/drivers/cpufreq/longhaul.c
--- 2/drivers/cpufreq/longhaul.c
--- 3/drivers/cpufreq/longhaul.c
--- 4/drivers/cpufreq/longhaul.c
--- 5/drivers/cpufreq/longhaul.c
--- 6/drivers/cpufreq/longhaul.c
--- 7/drivers/cpufreq/longhaul.c
--- 8/drivers/cpufreq/longhaul.c
--- 9/drivers/cpufreq/longhaul.c
+++ b/drivers/cpufreq/longhaul.c
@@@@@@@@@@ -271,6 -269,8 -269,8 -269,8 -269,8 -271,6 -269,8 -269,8 -269,8 +271,6 @@@@@@@@@@ static int longhaul_setstate(struct cpu
                freqs.old = calc_speed(longhaul_get_cpu_mult());
                freqs.new = speed;
         
 ---- - -       cpufreq_freq_transition_begin(policy, &freqs);
       -        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 ---- ---
                pr_debug("Setting to FSB:%dMHz Mult:%d.%dx (%s)\n",
                                fsb, mult/10, mult%10, print_speed(speed/1000));
         retry_loop:
@@@@@@@@@@ -385,14 -385,12 -385,12 -385,12 -385,12 -385,14 -385,12 -385,12 -385,12 +385,14 @@@@@@@@@@
                                goto retry_loop;
                        }
                }
 ---- ---       /* Report true CPU frequency */
 ---- - -       cpufreq_freq_transition_end(policy, &freqs, 0);
       -        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
         
 ---- ---       if (!bm_timeout)
 ++++ +++       if (!bm_timeout) {
                        printk(KERN_INFO PFX "Warning: Timeout while waiting for "
                                        "idle PCI bus.\n");
 ++++ +++               return -EBUSY;
 ++++ +++       }
 ++++ +++
 ++++ +++       return 0;
         }
         
         /*

diff --cc drivers/cpufreq/powernow-k6.c
index 78904e6ca4a020d53a60f4139711441a069ad447,49f120e1bc7be0ecb879f184424d1dc56ee63981,a133236a00130eab3618a75737299e9d00a047b5,49f120e1bc7be0ecb879f184424d1dc56ee63981,49f120e1bc7be0ecb879f184424d1dc56ee63981,78904e6ca4a020d53a60f4139711441a069ad447,49f120e1bc7be0ecb879f184424d1dc56ee63981,b9a444e358b5cfeb25da13739b374d02124cf011,49f120e1bc7be0ecb879f184424d1dc56ee63981..c8012bc869107206ad1fd7024ab86a76a406890e
--- 1/drivers/cpufreq/powernow-k6.c
--- 2/drivers/cpufreq/powernow-k6.c
--- 3/drivers/cpufreq/powernow-k6.c
--- 4/drivers/cpufreq/powernow-k6.c
--- 5/drivers/cpufreq/powernow-k6.c
--- 6/drivers/cpufreq/powernow-k6.c
--- 7/drivers/cpufreq/powernow-k6.c
--- 8/drivers/cpufreq/powernow-k6.c
--- 9/drivers/cpufreq/powernow-k6.c
+++ b/drivers/cpufreq/powernow-k6.c
@@@@@@@@@@ -144,8 -145,15 -145,15 -145,15 -145,15 -144,8 -145,15 -145,15 -145,15 +144,8 @@@@@@@@@@ static int powernow_k6_target(struct cp
                        return -EINVAL;
                }
         
 ---- ---       freqs.old = busfreq * powernow_k6_get_cpu_multiplier();
 ---- ---       freqs.new = busfreq * clock_ratio[best_i].driver_data;
 ---- ---
 ---- - -       cpufreq_freq_transition_begin(policy, &freqs);
       -        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 ---- ---
                powernow_k6_set_cpu_multiplier(best_i);
         
 ---- - -       cpufreq_freq_transition_end(policy, &freqs, 0);
       -        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 ---- ---
                return 0;
         }
         
@@@@@@@@@@ -219,21 -227,10 -227,10 -227,10 -227,10 -219,21 -227,10 -227,11 -227,10 +219,21 @@@@@@@@@@ have_busfreq
         static int powernow_k6_cpu_exit(struct cpufreq_policy *policy)
         {
                unsigned int i;
 ---- ---       for (i = 0; i < 8; i++) {
 ---- ---               if (i == max_multiplier)
 ++++ +++
 ++++ +++       for (i = 0; (clock_ratio[i].frequency != CPUFREQ_TABLE_END); i++) {
 ++++ +++               if (clock_ratio[i].driver_data == max_multiplier) {
 ++++ +++                       struct cpufreq_freqs freqs;
 ++++ +++
 ++++ +++                       freqs.old = policy->cur;
 ++++ +++                       freqs.new = clock_ratio[i].frequency;
 ++++ +++                       freqs.flags = 0;
 ++++ +++
 ++++ +++                       cpufreq_freq_transition_begin(policy, &freqs);
                                powernow_k6_target(policy, i);
 ++++ +++                       cpufreq_freq_transition_end(policy, &freqs, 0);
 ++++ +++                       break;
 ++++ +++               }
                }
       -        cpufreq_frequency_table_put_attr(policy->cpu);
                return 0;
         }
         

diff --cc drivers/mfd/Kconfig
index 33834120d057117f5b98284227ee0e3ec59df371,33834120d057117f5b98284227ee0e3ec59df371,33834120d057117f5b98284227ee0e3ec59df371,33834120d057117f5b98284227ee0e3ec59df371,5bdefe72625e041a1bec0797fbfa1eb5722f1ae7,29be025d58355749f96f90fba21cf7933d9cbe80,33834120d057117f5b98284227ee0e3ec59df371,49bb445d846aa76e206dfe7fb7d30ad5f24b6b97,33834120d057117f5b98284227ee0e3ec59df371..e166d7176d7af34d56de4b4c28e9b635e0ad80c3
--- 1/drivers/mfd/Kconfig
--- 2/drivers/mfd/Kconfig
--- 3/drivers/mfd/Kconfig
--- 4/drivers/mfd/Kconfig
--- 5/drivers/mfd/Kconfig
--- 6/drivers/mfd/Kconfig
--- 7/drivers/mfd/Kconfig
--- 8/drivers/mfd/Kconfig
--- 9/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@@@@@@@@@ -335,11 -335,11 -335,11 -335,11 -335,11 -335,11 -335,11 -322,10 -335,11 +335,11 @@@@@@@@@@ config MFD_MAX1457
                depends on I2C=y
                select MFD_CORE
                select REGMAP_I2C
       +        select REGMAP_IRQ
                select IRQ_DOMAIN
                help
---- -- -         Say yes here to add support for Maxim Semiconductor MAX14577.
       -          Say yes here to support for Maxim Semiconductor MAX14577.
---- ----         This is a Micro-USB IC with Charger controls on chip.
++++ ++++         Say yes here to add support for Maxim Semiconductor MAX14577 and
++++ ++++         MAX77836 Micro-USB ICs with battery charger.
                  This driver provides common support for accessing the device;
                  additional drivers must be enabled in order to use the functionality
                  of the device.

diff --cc drivers/mfd/twl-core.c
Simple merge