summaryrefslogtreecommitdiff
path: root/arch/mn10300/kernel/traps.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-07-12 14:44:43 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-07-12 14:44:43 -0700
commit7e48c02829ad6a824775a78bf100acbcbac2871f (patch)
tree9f9cb4a2cd18e64a63535878d30253236ccca5e0 /arch/mn10300/kernel/traps.c
parent9f71963702764243d0835b07660ae505b66ca09f (diff)
parentac0547dc62e67a3e0b0c1628b6e49efba8f517db (diff)
Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: hda - Restore cleared pin controls on resume
Diffstat (limited to 'arch/mn10300/kernel/traps.c')
0 files changed, 0 insertions, 0 deletions