diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-04-04 01:33:49 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-04-04 01:33:49 +0200 |
commit | bce5669be3a8946952258a064ef26defeb887138 (patch) | |
tree | 117386b9909882c000f822011c5ea6fdcbab3273 /sound/parisc/harmony.c | |
parent | Merge branches 'amba', 'fixes', 'misc', 'mmci', 'unstable/omap-dma' and 'unst... (diff) | |
parent | Merge branch 'uprobes-v7' of git://git.linaro.org/people/dave.long/linux into... (diff) | |
download | linux-bce5669be3a8946952258a064ef26defeb887138.tar.xz linux-bce5669be3a8946952258a064ef26defeb887138.zip |
Merge branch 'devel-stable' into for-next
Diffstat (limited to 'sound/parisc/harmony.c')
0 files changed, 0 insertions, 0 deletions