summaryrefslogtreecommitdiffstats
path: root/sound/pci/oxygen/xonar_dg.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2014-04-04 01:33:49 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-04-04 01:33:49 +0200
commitbce5669be3a8946952258a064ef26defeb887138 (patch)
tree117386b9909882c000f822011c5ea6fdcbab3273 /sound/pci/oxygen/xonar_dg.c
parentMerge branches 'amba', 'fixes', 'misc', 'mmci', 'unstable/omap-dma' and 'unst... (diff)
parentMerge branch 'uprobes-v7' of git://git.linaro.org/people/dave.long/linux into... (diff)
downloadlinux-bce5669be3a8946952258a064ef26defeb887138.tar.xz
linux-bce5669be3a8946952258a064ef26defeb887138.zip
Merge branch 'devel-stable' into for-next
Diffstat (limited to 'sound/pci/oxygen/xonar_dg.c')
0 files changed, 0 insertions, 0 deletions