diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-16 10:00:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-16 10:00:18 -0700 |
| commit | 0f7dd1aa8f959216f1faa71513b9d3c1a9065e5a (patch) | |
| tree | cdef5ea90c240a79b45cbbc8645bd5a635f95463 /net/sctp | |
| parent | 2d2843e614f6f7aced9dd351a056ac1150d3f82f (diff) | |
| parent | a701fe3851d9c7f6bd27bc0b92ca1668a42c8406 (diff) | |
Merge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux
Pull clock controller fixes from Michael Turquette:
"Two small fixes for the Zynq clock controller introduced in 3.11-rc1
and another Exynos clock patch which fixes a regression that prevents
the video pipeline from functioning on that platform"
* tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux:
clk: exynos4: Add CLK_GET_RATE_NOCACHE flag for the Exynos4x12 ISP clocks
clk/zynq/clkc: Add CLK_SET_RATE_PARENT flag to ethernet muxes
clk/zynq/clkc: Add dedicated spinlock for the SWDT
Diffstat (limited to 'net/sctp')
0 files changed, 0 insertions, 0 deletions