diff options
| author | Mark Brown <broonie@kernel.org> | 2014-09-06 11:08:20 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-09-06 11:08:20 +0100 |
| commit | 32de5d0e850682c07b172b086cd1562cb350a8ea (patch) | |
| tree | 212060407bec8257ebd89992f170917c5ea58d60 /Documentation | |
| parent | 68e9a7c161360ecaa4596b1bff69b5bec4c2487f (diff) | |
| parent | 8e952ae717dea59aa8104421dc4d3b9e66981c7d (diff) | |
Merge tag 'v3.14.18' into linux-linaro-lsk-v3.14
This is the 3.14.18 stable release
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/sound/alsa/ALSA-Configuration.txt | 4 | ||||
| -rw-r--r-- | Documentation/stable_kernel_rules.txt | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt index b8dd0df76952..0fd40b15e2d5 100644 --- a/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/Documentation/sound/alsa/ALSA-Configuration.txt @@ -2026,8 +2026,8 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. ------------------- Module for sound cards based on the Asus AV66/AV100/AV200 chips, - i.e., Xonar D1, DX, D2, D2X, DS, Essence ST (Deluxe), Essence STX, - HDAV1.3 (Deluxe), and HDAV1.3 Slim. + i.e., Xonar D1, DX, D2, D2X, DS, DSX, Essence ST (Deluxe), + Essence STX (II), HDAV1.3 (Deluxe), and HDAV1.3 Slim. This module supports autoprobe and multiple cards. diff --git a/Documentation/stable_kernel_rules.txt b/Documentation/stable_kernel_rules.txt index b0714d8f678a..8dfb6a5f427d 100644 --- a/Documentation/stable_kernel_rules.txt +++ b/Documentation/stable_kernel_rules.txt @@ -29,6 +29,9 @@ Rules on what kind of patches are accepted, and which ones are not, into the Procedure for submitting patches to the -stable tree: + - If the patch covers files in net/ or drivers/net please follow netdev stable + submission guidelines as described in + Documentation/networking/netdev-FAQ.txt - Send the patch, after verifying that it follows the above rules, to stable@vger.kernel.org. You must note the upstream commit ID in the changelog of your submission, as well as the kernel version you wish |