summaryrefslogtreecommitdiffstats
path: root/drivers/net/can/usb
diff options
context:
space:
mode:
authorLinus Torvalds2012-11-24 19:32:11 +0100
committerLinus Torvalds2012-11-24 19:32:11 +0100
commit194d9831f0419b5125dc94ec0ece4434d8ef74f0 (patch)
treeea50492504dbb9965ba6a0abf8f270febdb6e669 /drivers/net/can/usb
parentMerge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff)
parentALSA: hda - Fix build without CONFIG_PM (diff)
downloadkernel-qcow2-linux-194d9831f0419b5125dc94ec0ece4434d8ef74f0.tar.gz
kernel-qcow2-linux-194d9831f0419b5125dc94ec0ece4434d8ef74f0.tar.xz
kernel-qcow2-linux-194d9831f0419b5125dc94ec0ece4434d8ef74f0.zip
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 'drivers/net/can/usb')
0 files changed, 0 insertions, 0 deletions