diff options
author | Mark Brown <broonie@kernel.org> | 2015-02-04 23:57:07 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-02-04 23:57:07 +0300 |
commit | 699994d07e42bfbad6fbb564632ee8ebf6927a15 (patch) | |
tree | f6e76e8ff11714238d121a22827bb1b7f1aff62b /drivers/watchdog/meson_wdt.c | |
parent | 7a869e108e5d82b021a6ce10d25e97e6b7f5823a (diff) | |
parent | bdb2c74d44be691e6d3b6d441e81ea13dab34145 (diff) | |
parent | 2b730cc38d3ca592b4f9f71989e7f0c79b37b3b3 (diff) | |
parent | 56bbd86c2e47d4f7707cb329fc008487c940ca27 (diff) | |
parent | 12e29a075d4c0c9767261068cdcbfa4b346a451b (diff) | |
download | linux-699994d07e42bfbad6fbb564632ee8ebf6927a15.tar.xz |
Merge remote-tracking branches 'asoc/topic/ad193x', 'asoc/topic/alc5632', 'asoc/topic/atmel' and 'asoc/topic/au1x' into asoc-next