diff options
| author | Mark Brown <broonie@kernel.org> | 2016-12-12 12:17:31 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-12-12 12:17:31 +0000 |
| commit | d00b74613fb18dfd0a5aa99270ee2e72d5c808d7 (patch) | |
| tree | a4a76197dc9cc07a9b64c3834bfc4f139f6447ef /net/dccp/proto.c | |
| parent | 56e3d92ddb97d9584622b29d4ecb268e30242b1e (diff) | |
| parent | f8192880a102849d84fe0f5e27bc8625a33e031c (diff) | |
| parent | 3498c5e15db3af90aee7dbe9a0910225422b85c1 (diff) | |
Merge remote-tracking branches 'regulator/topic/tps65086' and 'regulator/topic/twl' into regulator-next