diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-02 07:54:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-02 07:54:32 -0700 |
| commit | 550ac958791399266c20e15e8048cd12bfce08ae (patch) | |
| tree | c5b0f662c06d2f260ed6f655f4fd3f86d72ba816 /include/asm-parisc/resource.h | |
| parent | 1fce2d01dff65a76cd08c1b145acd9d3c20021d2 (diff) | |
| parent | 591d8a25c7c242f6b00be120ed378e585a5afb47 (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: snd-powermac: HP detection for 1st iMac G3 SL
ALSA: snd-powermac: mixers for PowerMac G4 AGP
ASoC: Set correct name for WM8753 rec mixer output
Diffstat (limited to 'include/asm-parisc/resource.h')
0 files changed, 0 insertions, 0 deletions