John Stultz
d3d8fee413
Revert "dw_apb_timer_of.c: Remove parts that were picoxcell-specific"
...
This reverts commit 55a68c23e0 .
In order to avoid a collision with dw_apb_timer changes in
the arm-soc tree, revert this change.
I'm leaving it to the arm-soc folks to sort out if they want
to keep the other side of the collision or if they're just going
to back it all out and try again during the next release cycle.
Reported-by: Dinh Nguyen <dinguyen@altera.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
2013-06-18 16:02:04 -07:00
..
acpi
asm-generic
Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-05-05 13:23:27 -07:00
clocksource
ARM: late Exynos multiplatform changes
2013-05-07 11:28:42 -07:00
crypto
drm
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2013-05-13 07:59:59 -07:00
dt-bindings
keys
linux
Revert "dw_apb_timer_of.c: Remove parts that were picoxcell-specific"
2013-06-18 16:02:04 -07:00
math-emu
media
Merge branch 'topic/omap3isp' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2013-05-01 09:57:04 -07:00
memory
misc
net
ipv6: do not clear pinet6 field
2013-05-11 16:26:38 -07:00
pcmcia
ras
rdma
rxrpc
scsi
Merge branch 'postmerge' into for-linus
2013-05-10 07:54:01 -07:00
sound
sound fixes for v3.10-rc1
2013-05-10 07:51:56 -07:00
target
trace
Fixed regressions (two stability regressions and a performance
2013-05-14 09:30:54 -07:00
uapi
Merge git://git.infradead.org/users/eparis/audit
2013-05-11 14:29:11 -07:00
video
Merge branch 'late/clksrc' into late/cleanup
2013-05-06 23:43:45 +02:00
xen
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-05-01 14:08:52 -07:00
Kbuild
UAPI: remove empty Kbuild files
2013-04-30 17:04:09 -07:00