summaryrefslogtreecommitdiffstats
path: root/kernel/trace/ring_buffer.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-13 14:39:54 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-13 14:39:54 -0800
commit461d208cfbd1f0af26027b2c35ded515e54b1ee6 (patch)
tree30384817c1567db054e499c1ed964b37c7c76a2a /kernel/trace/ring_buffer.c
parent9fdfbc2bff587f454dd95e2caa6d147c9abe39e4 (diff)
parent0e49887703015dd73667664c5abc9a6366641da9 (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: hda - Sound MSI fallout on a Asus mobo NVIDIA MCP55 sound: fix opti92x-ad1848 build ALSA: hda - Fix input source elements of secondary ADCs on Realtek ALSA: hda - Fix wrong model range check for ALC268
Diffstat (limited to 'kernel/trace/ring_buffer.c')
0 files changed, 0 insertions, 0 deletions