diff options
author | Kevin Hilman <khilman@linaro.org> | 2014-01-15 00:41:48 +0100 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2014-01-15 00:41:57 +0100 |
commit | 273c2279ca502267fac40bcaecb35942380c429c (patch) | |
tree | d062ef1ef525a7a6d4904eeabe52ae6221249846 /sound/soc/atmel/atmel-pcm.c | |
parent | Merge tag 'mvebu-soc-3.14-2' of git://git.infradead.org/linux-mvebu into next... (diff) | |
parent | ARM: at91: switch Calao QIL-A9260 board to DT (diff) | |
download | linux-273c2279ca502267fac40bcaecb35942380c429c.tar.xz linux-273c2279ca502267fac40bcaecb35942380c429c.zip |
Merge tag 'at91-cleanup2' of git://github.com/at91linux/linux-at91 into next/cleanup
From Nicolas Ferre:
Second cleanup pull-request for 3.14:
- a tiny fix for the recent AT91 CCF implementation
- the switch of one platform to DT with board file removal
* tag 'at91-cleanup2' of git://github.com/at91linux/linux-at91:
ARM: at91: switch Calao QIL-A9260 board to DT
clk: at91: fix pmc_clk_ids data type attriubte
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'sound/soc/atmel/atmel-pcm.c')
0 files changed, 0 insertions, 0 deletions