diff options
| author | Manuel Traut <manut@linutronix.de> | 2010-12-01 13:50:43 +0100 |
|---|---|---|
| committer | Manuel Traut <manut@linutronix.de> | 2010-12-01 13:50:43 +0100 |
| commit | 4eaadbd816e2f5f0717d789188e6086612262e73 (patch) | |
| tree | 374bd9621c768434e1fe94b5539a993d521f06a1 /Makefile | |
| parent | e5d61ba5f48748e337daca006aecc241294fa7a4 (diff) | |
| parent | ae7348cf4a6b14926bc0f9c778f465538d968259 (diff) | |
Merge branch 'continental' of tglx.de:/home/jan/git/schulung into jan
Conflicts:
Makefile
Signed-off-by: Manuel Traut <manut@linutronix.de>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,4 +1,4 @@ -SUBDIRS = kernel-devel linux-basics realtime application-devel flash-memory frameworks +SUBDIRS = kernel-devel linux-basics realtime application-devel flash-memory protocols frameworks default: make all |