diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-22 16:38:52 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-22 16:38:52 -0400 |
| commit | 2528ed119b8f4fc553f9d1e65719ae183ffa97f4 (patch) | |
| tree | 8ca7caff8ab0c8f6d349cb0feab360e08a3cc3d9 /arch/arm/mach-mmp/include/mach/memory.h | |
| parent | 6a44587ee716ac911082cbdec766e5b3f051c071 (diff) | |
| parent | 4986cab5551cd22e6a57d5e2511b80d38669e1ca (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: Kill truncate warning by shortening Sigmatel-specific AC97 control name
ALSA: hda - fix audio on HP TX25xx series notebooks
ALSA: pcsp - fix printk format warning again
Diffstat (limited to 'arch/arm/mach-mmp/include/mach/memory.h')
0 files changed, 0 insertions, 0 deletions