diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-06-10 07:26:45 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-06-10 07:26:45 +0200 |
| commit | 45d60e3648eaba1f5f6976df901fb7c45660fb49 (patch) | |
| tree | fb468f9c69a650989590dd6b5c6563fc796403e9 /arch/x86/boot/memory.c | |
| parent | 87cb14a5f46207f5c445dd755096f8568d136a2a (diff) | |
| parent | b0ec3a30bc01c15cc6277b223fae136f7b71e90c (diff) | |
Merge branch 'topic/sc6000' into for-linus
* topic/sc6000:
ALSA: sc6000: enable joystick port
ALSA: sc6000: fix older card initialization
ALSA: sc6000: add support for SC-6600 and SC-7000
Diffstat (limited to 'arch/x86/boot/memory.c')
0 files changed, 0 insertions, 0 deletions