aboutsummaryrefslogtreecommitdiff
path: root/arch/m32r/include/asm/segment.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-04-19 11:39:46 +0200
committerTakashi Iwai <tiwai@suse.de>2009-04-19 11:39:46 +0200
commit7c4112a285b00e137db04844b8b9b478e5d4363e (patch)
tree6e708230baf2213b902a1e8f04a21c9bf64487a3 /arch/m32r/include/asm/segment.h
parent1e2ae4ddd373af6fa3ea2483d7fc4a08c7f54395 (diff)
parent93e82ae781e1ca4797cf2a226d3c303975bd99c7 (diff)
Merge branch 'fix/hda' into for-linus
* fix/hda: ALSA: hda - Set function_id only on FG nodes ALSA: hda - Add upper-limit of mixer amp for AD1884A-laptop model, too ALSA: hda - Fix headphone-detection on some machines with STAC/IDT codecs ALSA: hda_intel.c - Consolidate bitfields
Diffstat (limited to 'arch/m32r/include/asm/segment.h')
0 files changed, 0 insertions, 0 deletions