Merge branch 'next/timer' into for-next

diff --cc arch/arm/arm-soc-for-next-contents.txt
index 56803246ce696a7fd38733123ba998de935d142a,0000000000000000000000000000000000000000..5234a1822e3e4f83bc2ba751554759bd88e7632e
mode 100644,000000..100644
--- 1/arch/arm/arm-soc-for-next-contents.txt
--- /dev/null
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@@ -1,17 -1,0 +1,20 @@@
 +This file lists all branches that are pulled into the for-next branch
 +of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git
 +and their external dependencies.
 +
 +Currently there are no dependencies.
 +
 +next/cleanup
 +  at91/ioremap                git://github.com/at91linux/linux-at91.git for-arnd-3.3-ioremap
 +  at91/gpio           git://github.com/at91linux/linux-at91.git for-arnd-3.3-gpio
 +  drivers/macb-gem-cleanup    parts of drivers/macb-gem that at91/gpio depends on
 +
 +next/drivers
 +  drivers/macb-gem    git://github.com/jamieiles/linux-2.6-ji.git macb-gem
 +  drivers/pxa-gpio    git://github.com/hzhuang1/linux.git gpio
 +
++next/timer
++  msm/timer           git://codeaurora.org/quic/kernel/davidb/linux-msm.git msm-timer
++
 +next/move
 +  imx/move            git://git.pengutronix.de/git/imx/linux-2.6.git mx5-merge