aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-28 14:24:34 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-28 14:24:34 -0700
commit6b3a7c0f8a030561cb4eb5e905149938575e8085 (patch)
tree5730e211e047256bf00e332855ca82844bb66b05 /arch
parentMerge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung (diff)
parentMerge branch 'fix/asoc' into for-linus (diff)
downloadlinux-dev-6b3a7c0f8a030561cb4eb5e905149938575e8085.tar.xz
linux-dev-6b3a7c0f8a030561cb4eb5e905149938575e8085.zip
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: pcm: add more format names sound: oss: fix uninitialized spinlock ALSA: asihpi - Return hw error directly from oustream_write. ASoC: soc-core: fix debugfs_pop_time file permissions ALSA: hda - Add Sony VAIO quirk for ALC269
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions