Stephen Boyd
faef31b482
clocksource: time-armada-370-xp: Fix sparse warning ...
drivers/clocksource/time-armada-370-xp.c:217:13: warning: symbol
'armada_370_xp_timer_init' was not declared. Should it be static?
Also remove the __init marking in the prototype as it's
unnecessary and drop the init.h file.
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
2013-06-24 17:47:21 -07:00
Merge branch 'acpi-assorted'
2013-04-28 01:54:08 +02:00
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
ARM: late Exynos multiplatform changes
2013-05-07 11:28:42 -07:00
crypto: sha512 - Expose generic sha512 routine to be callable from other modules
2013-04-25 21:00:57 +08:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2013-05-13 07:59:59 -07:00
clocksource: time-armada-370-xp: Fix sparse warning
2013-06-24 17:47:21 -07:00
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
ipv6: do not clear pinet6 field
2013-05-11 16:26:38 -07:00
Merge branch 'postmerge' into for-linus
2013-05-10 07:54:01 -07:00
sound fixes for v3.10-rc1
2013-05-10 07:51:56 -07:00
iscsi-target: Add iscsit_transport API template
2013-04-25 01:05:26 -07:00
Fixed regressions (two stability regressions and a performance
2013-05-14 09:30:54 -07:00
Merge git://git.infradead.org/users/eparis/audit
2013-05-11 14:29:11 -07:00
Merge branch 'late/clksrc' into late/cleanup
2013-05-06 23:43:45 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-05-01 14:08:52 -07:00
UAPI: remove empty Kbuild files
2013-04-30 17:04:09 -07:00
faef31b482