path: root/net/sctp/sysctl.c
diff options
authorMike Turquette <mturquette@linaro.org>2014-06-11 07:11:59 -0700
committerMike Turquette <mturquette@linaro.org>2014-06-11 07:11:59 -0700
commitb640a6037c9ecd1f0ad23a8e9b4ca5f5b4112508 (patch)
tree29d2f18d98f7daef1fd8033e95583d83f2096bc2 /net/sctp/sysctl.c
parent3f6eec9969d24f91a3909d51e86e007ca5efd4c4 (diff)
parent5c89a8b65760a60eea38e0b172d04152ec03a067 (diff)
Merge tag 'sunxi-clk-for-3.16-2' of https://github.com/mripard/linux into clk-next
Rebase of Emilio's clk-sunxi-for-3.16 on top of clk-next Fixed a few compilation warnings exposed by a patch introduced during the 3.16 merge window. Original tag message: Allwinner sunXi SoCs clock changes This pull contains some new code to add support for A31 clocks by Maxime and Boris. It also reworks the driver a bit to avoid having a huge single file when we have a full folder for ourselves, and separating different functional units makes sense.
Diffstat (limited to 'net/sctp/sysctl.c')
0 files changed, 0 insertions, 0 deletions