diff options
author | Stefan Agner <stefan.agner@toradex.com> | 2018-01-24 15:03:41 +0100 |
---|---|---|
committer | Stefan Agner <stefan.agner@toradex.com> | 2018-01-24 15:03:41 +0100 |
commit | 0710597796a48009846e1aa72644c27e846296a9 (patch) | |
tree | fbeb9a6ed9d1248fa022a549bcd50a7750de8dbe /.mailmap | |
parent | 953c6e30c9701fda69ef08e2476c541dc4fb1453 (diff) | |
parent | 7bbc6ca4887794cc44b41412a35bdfbe0cbd1c50 (diff) |
Merge tag 'v4.9.76' into 4.9-1.0.x-imx-stable-merge
This is the 4.9.76 stable release
Resolved conflicts
drivers/clk/imx/clk-imx6q.c
drivers/net/ethernet/freescale/fec_main.c
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions