| commit | 3aa6d053448d69738c8370c41bdd907acc40eb9f | [log] [tgz] |
|---|---|---|
| author | Petr Mladek <pmladek@suse.com> | Tue Jun 05 13:56:33 2018 +0200 |
| committer | Petr Mladek <pmladek@suse.com> | Tue Jun 05 13:56:33 2018 +0200 |
| tree | 7619ee205cd1763acc554e8716a4d71a6ab8eebe | |
| parent | 716a685fdb89942a50c4138141027e38336a895f [diff] | |
| parent | 8bafa2a44ff3647904eaa3c9228bfbd36742b9b4 [diff] |
Merge tag 'printk-for-4.18' into for-4.18-vsprintf-conflict Printk changes for 4.18 Conflicts: lib/vsprintf.c