diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2015-09-01 15:38:33 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-09-01 15:38:33 +0200 |
| commit | f212bd95a9f62b7929c59b16e1d3bbde2fb4081d (patch) | |
| tree | 62bf85b58c0e108b3c5597bfb5d492efd8322726 /drivers/clk/st/clk-flexgen.c | |
| parent | Merge branches 'for-4.3/chicony', 'for-4.3/cp2112', 'for-4.3/i2c-hid', 'for-4... (diff) | |
| parent | HID: microsoft: Add Surface 3 type cover (diff) | |
| download | linux-f212bd95a9f62b7929c59b16e1d3bbde2fb4081d.tar.xz linux-f212bd95a9f62b7929c59b16e1d3bbde2fb4081d.zip | |
Merge branch 'for-4.3/microsoft' into for-linus
Conflicts:
drivers/hid/usbhid/hid-quirks.c
Diffstat (limited to 'drivers/clk/st/clk-flexgen.c')
0 files changed, 0 insertions, 0 deletions