diff options
| author | NeilBrown <neilb@suse.de> | 2008-08-07 14:12:25 +1000 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2008-08-07 14:12:25 +1000 |
| commit | 37ea3936a696c2b102963ba5117165ef6be8d4b4 (patch) | |
| tree | 75fe06d0b49ef74f834a25920f003c693023857e /Makefile | |
| parent | 9ca2c81c0f8bd37ef24e5e3ac898ffb6cfd00117 (diff) | |
| parent | e5669f40047ba0a8354418d0af5f7e7d862aaea4 (diff) | |
| download | mdadm-37ea3936a696c2b102963ba5117165ef6be8d4b4.tar.gz mdadm-37ea3936a696c2b102963ba5117165ef6be8d4b4.tar.xz mdadm-37ea3936a696c2b102963ba5117165ef6be8d4b4.zip | |
Merge branch 'master' into from-stable
Conflicts:
Create.c
Manage.c
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -213,3 +213,9 @@ testdist : everything clean TAGS : etags *.h *.c + +DISTRO_MAKEFILE := $(wildcard distropkg/Makefile) +ifdef DISTRO_MAKEFILE +include $(DISTRO_MAKEFILE) +endif + |