diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-10-05 17:36:38 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-10-05 17:36:38 -0700 |
commit | 7b415285ae96f5bfa0fa95d3227c6900c4ff151d (patch) | |
tree | feb5198f57bfb5b58aca24ddc76a313236f94512 /block/Makefile | |
parent | c65cf815653ec64e73d40819806c2d1aed91681e (diff) | |
parent | 049e6dde7e57f0054fdc49102e7ef4830c698b46 (diff) | |
download | talos-op-linux-7b415285ae96f5bfa0fa95d3227c6900c4ff151d.tar.gz talos-op-linux-7b415285ae96f5bfa0fa95d3227c6900c4ff151d.zip |
Merge tag 'v4.3-rc4' into next
Merge with mainline to sync up with changes to parkbd driver.
Diffstat (limited to 'block/Makefile')
0 files changed, 0 insertions, 0 deletions