diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-05-12 11:09:47 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-05-12 11:09:47 +0100 |
| commit | 178e43aef2979525d7864daefd9499614e13800e (patch) | |
| tree | d7a7bbe05749b1f66d0deadf1bcecbc0b3d54fe6 /include/linux/cdrom.h | |
| parent | d48b97b403d23f6df0b990cee652bdf9a52337a3 (diff) | |
| parent | 6492bc1b1a9cb21d28cde3c70d090c7648c8b0ed (diff) | |
| parent | dcf701125eefea6baf72753533cb8b60fb0e3934 (diff) | |
Merge remote-tracking branches 'regulator/topic/core', 'regulator/topic/regmap' and 'regulator/topic/register' into regulator-next