diff options
| author | Michal Marek <mmarek@suse.cz> | 2014-06-10 00:44:21 +0200 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2014-06-10 00:44:21 +0200 |
| commit | b372bf0a06e9521f3102acc3290b5e980638d615 (patch) | |
| tree | 4fa5fc3cecb03136bddfeffd69de7e60381a1e66 /Makefile | |
| parent | 5366c855e0d8646bcdb5a6e5286cbf300688859f (diff) | |
| parent | 9815594a780404810c2a6280de1a268dcfcb0729 (diff) | |
| parent | 7eb6e340526adf14ed7cf7dfde8b9c6fc0741cfc (diff) | |
Merge branches 'kbuild/kbuild' and 'kbuild/misc' into kbuild/for-next
Conflicts:
scripts/Makefile.host (trivial context conflict)