summaryrefslogtreecommitdiff
path: root/block/blk-merge.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-09-25 09:51:31 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-25 09:51:31 -0700
commite7553b19da07fffbefe83119f25738e2cc90c426 (patch)
treee8d069cd621a1dfe7a3528c98855f0f3b86cc04b /block/blk-merge.c
parent5ec1055aa5632dd7a8283cdb5fa9be3c535eaa06 (diff)
parent3b23cd28751c70a3d9d4f5c9e1d2f6dbbe04f4e8 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: sound/pci/rme9652: prevent reading uninitialized stack memory ALSA: hda - Fix auto-parse of SPDIF input of Realtek codecs ASoC: Fix multi-componentism ASoC: Fix soc-cache buffer overflow bug ALSA: oxygen: fix analog capture on Claro halo cards ALSA: hda - Add Dell Latitude E6400 model quirk ASoC: fix clkdev API usage in sh/migor.c
Diffstat (limited to 'block/blk-merge.c')
0 files changed, 0 insertions, 0 deletions