tree 884d4fde45bd578a240b4a61fe8de3b6a4c13880
parent 625fc3a37511cbecfe1253867fe105c28d6a95f0
parent e3a2efa67a029453b8098dba179ec2d9d8df612e
author Linus Torvalds <torvalds@linux-foundation.org> 1210269525 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1210269525 -0700

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] soc at91 minor bug fixes
  [ALSA] soc - at91-pcm - Fix line wrapping
  pcspkr: fix dependancies