diff options
author | Mark Brown <broonie@kernel.org> | 2015-02-08 11:16:30 +0800 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-02-08 11:16:30 +0800 |
commit | dd7c2e720a16958da1279a8d69de6fb14b6f4ee4 (patch) | |
tree | 5a093466f0f308d54a4f5e33d89cfa6d8c1cfc14 /arch/arm/mach-omap2/timer.c | |
parent | ffe167b0f2debbb3e21d2094508f8caca5a5bd8e (diff) | |
parent | 5cb2f03c67265922c66e20270d4fd669a661da82 (diff) | |
parent | c6515d2f00dc45d6bf5b6e56c9a7d4dc2e271563 (diff) | |
parent | 53aebb7f19b71df6cf5aace87609b88cfc1c87ec (diff) | |
parent | 4604a061e6c2462330d56bb7edcd1ca3397a4b73 (diff) | |
download | talos-op-linux-dd7c2e720a16958da1279a8d69de6fb14b6f4ee4.tar.gz talos-op-linux-dd7c2e720a16958da1279a8d69de6fb14b6f4ee4.zip |
Merge remote-tracking branches 'regulator/topic/rk808', 'regulator/topic/rpm', 'regulator/topic/rt5033' and 'regulator/topic/tps65023' into regulator-next