diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-10-17 16:28:20 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-10-17 16:28:20 +0200 |
| commit | 2190521e01ca4d33fd055dc2c4c92352f91b3c26 (patch) | |
| tree | 586b83b26490461b7cb4531dbd04d9695a77a89e /include/asm-m68k/mman.h | |
| parent | af31ed217a0fe433e06c83b978bcb805ada6295a (diff) | |
| parent | cdbdd1676a5379f1d5cbd4d476f5e349f445befe (diff) | |
| parent | ec4e86ba0662ed85f3b3a38fb220dc51d951da84 (diff) | |
| parent | 1c85cc64456c97f3b265788abafec5c482c6a908 (diff) | |
Merge branches 'topic/asoc', 'topic/hda' and 'topic/misc-fixes' into for-linus