diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-09 06:27:51 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-09 06:27:51 +0200 |
commit | 141dc40ee343ab532717b235dd645e2d25ae3092 (patch) | |
tree | 2289e5d1ec20df5e465b9b629e291877f4d70485 /sound/oss/ulaw.h | |
parent | Merge tag 'for-usb-next-2013-06-06' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
parent | Linux 3.10-rc5 (diff) | |
download | linux-141dc40ee343ab532717b235dd645e2d25ae3092.tar.xz linux-141dc40ee343ab532717b235dd645e2d25ae3092.zip |
Merge 3.10-rc5 into usb-next
We need the changes in this branch.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/oss/ulaw.h')
0 files changed, 0 insertions, 0 deletions