Another "small" merge point to handle conflicts in a sane way. Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I5dc2f5f11275b29f3c9b5b8d4dd59864ceb6faf9 |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| devicetable-offsets.c | ||
| empty.c | ||
| file2alias.c | ||
| Makefile | ||
| mk_elfconfig.c | ||
| modpost.c | ||
| modpost.h | ||
| sumversion.c | ||