Merge remote-tracking branch 'tip/core/rcu' into next.2012.09.25b

Resolved conflict in kernel/sched/core.c using Peter Zijlstra's
approach from https://lkml.org/lkml/2012/9/5/585.

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/i2c/algos/i2c-algo-pca.c b/drivers/i2c/algos/i2c-algo-pca.c
index 73133b1063f0..6f5f98d69af7 100644
--- a/drivers/i2c/algos/i2c-algo-pca.c
+++ b/drivers/i2c/algos/i2c-algo-pca.c
@@ -476,17 +476,17 @@ static int pca_init(struct i2c_adapter *adap)
                 /* To avoid integer overflow, use clock/100 for calculations */
                 clock = pca_clock(pca_data) / 100;
 
-                if (pca_data->i2c_clock > 10000) {
+                if (pca_data->i2c_clock > 1000000) {
                         mode = I2C_PCA_MODE_TURBO;
                         min_tlow = 14;
                         min_thi  = 5;
                         raise_fall_time = 22; /* Raise 11e-8s, Fall 11e-8s */
-                } else if (pca_data->i2c_clock > 4000) {
+                } else if (pca_data->i2c_clock > 400000) {
                         mode = I2C_PCA_MODE_FASTP;
                         min_tlow = 17;
                         min_thi  = 9;
                         raise_fall_time = 22; /* Raise 11e-8s, Fall 11e-8s */
-                } else if (pca_data->i2c_clock > 1000) {
+                } else if (pca_data->i2c_clock > 100000) {
                         mode = I2C_PCA_MODE_FAST;
                         min_tlow = 44;
                         min_thi  = 20;