diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-24 08:32:11 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-24 08:32:11 -1000 |
| commit | 194d9831f0419b5125dc94ec0ece4434d8ef74f0 (patch) | |
| tree | ea50492504dbb9965ba6a0abf8f270febdb6e669 /net/ipv4/tcp_diag.c | |
| parent | 2654ad44b5f7a5f1b12d722a37d9b9df69d57899 (diff) | |
| parent | d846b17475d52f037437d125cd19c28f1d36e4f0 (diff) | |
Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound build error fix from Takashi Iwai:
"Only a single commit for fixing the build error without CONFIG_PM in
hda driver."
* tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: hda - Fix build without CONFIG_PM
Diffstat (limited to 'net/ipv4/tcp_diag.c')
0 files changed, 0 insertions, 0 deletions