diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-04-23 23:05:16 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-04-23 23:05:16 +0200 |
commit | 6b7acae74fc2ffe6cfd7592e95ca933cadb31219 (patch) | |
tree | a3a1aa0aec02ffbf5d4b323869a81610f93094a4 /sound/usb | |
parent | Merge branch 'devel-stable' into for-next (diff) | |
parent | ARM: Fix nommu booting (diff) | |
parent | ARM: 8344/1: VDSO: honor CONFIG_VDSO in Makefile (diff) | |
download | linux-6b7acae74fc2ffe6cfd7592e95ca933cadb31219.tar.xz linux-6b7acae74fc2ffe6cfd7592e95ca933cadb31219.zip |
Merge branches 'misc' and 'vdso' into for-next