summaryrefslogtreecommitdiff
path: root/scripts/patch-kernel
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-11-15 21:05:21 +0300
committerTakashi Iwai <tiwai@suse.de>2008-11-15 21:05:21 +0300
commite2da9ba570418fb4061f0a5cfe4338be6470c02b (patch)
treeabdee28e90a5a911d0762286d729ea7f7d3cb65b /scripts/patch-kernel
parent127e82e3bfaad29e78ff5d4b1c41ab5e2d69c17f (diff)
parentc39555d6edd0142972f577405d5259879ecc1635 (diff)
downloadlinux-e2da9ba570418fb4061f0a5cfe4338be6470c02b.tar.xz
Merge branch 'topic/fix/hda' into topic/hda
Conflicts: sound/pci/hda/patch_sigmatel.c
Diffstat (limited to 'scripts/patch-kernel')
0 files changed, 0 insertions, 0 deletions