diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-10-15 10:18:19 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-10-15 10:18:19 -0400 |
| commit | af31ed217a0fe433e06c83b978bcb805ada6295a (patch) | |
| tree | 6eb1f35e49e8b24f86df31179712a9d21247b1db /arch/ia64/include/asm/pci.h | |
| parent | 428ffb7151a4078994b5c01ecbf845954843c1ec (diff) | |
| parent | 80ffe86925a226f513b36d0ce13e049133841970 (diff) | |
| parent | d5d8d83773165b951d190717637bfbc1eb0111a0 (diff) | |
Merge branches 'topic/misc-fixes', 'topic/hda' and 'topic/asoc' into for-linus