diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-09-03 01:52:11 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-09-03 01:52:11 +0300 |
| commit | 9064a1c77dd3a5c7288b0254a336d6f4073cd996 (patch) | |
| tree | 18d84e2dabc88c0882c2f6cf7e3ce2d8ac17d312 /scripts/pnmtologo.c | |
| parent | 7d3ef43f1f99d4250ff120c8965b3e5cd81b3c71 (diff) | |
| parent | 23540d6e2f3193b946c4de43e3f9654fa6d23fe7 (diff) | |
| download | linux-9064a1c77dd3a5c7288b0254a336d6f4073cd996.tar.xz | |
Merge commit 'http://github.com/rogerq/linux gpmc-omap-v4.8-rc1' into next/drivers
This is also going to be part of v4.8 and sent as a bugfix,
merging it here to avoid a small conflict against the other
gpmc changes.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'scripts/pnmtologo.c')
0 files changed, 0 insertions, 0 deletions