diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-11-24 17:32:59 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-11-24 17:32:59 +0900 |
commit | be09d1dcf21eb3121bed3ee4dadacdea1805d7f8 (patch) | |
tree | 5268aaba99aee3a03263bd7c24dfd174cafeb332 /include/sound/info.h | |
parent | 9bcc0a5d0de137b3a154dc951c5ff70dce815879 (diff) | |
parent | 33661c9e2062865acde9d421c971f1c142cf99ca (diff) | |
parent | eded9143151a116753b1d8e893bc2d37f8687e0b (diff) | |
download | linux-be09d1dcf21eb3121bed3ee4dadacdea1805d7f8.tar.gz linux-be09d1dcf21eb3121bed3ee4dadacdea1805d7f8.tar.bz2 linux-be09d1dcf21eb3121bed3ee4dadacdea1805d7f8.zip |
Merge branches 'rmobile/core', 'rmobile/kota2' and 'rmobile/ag5' into rmobile-fixes-for-linus