diff options
| author | Michal Marek <mmarek@suse.cz> | 2014-07-16 17:22:25 +0200 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2014-07-16 17:22:25 +0200 |
| commit | cf207dde8ee1c6b8b4d871307c535c7469e3dfa1 (patch) | |
| tree | 563cfc9a625708cdcbc07cc955405ea62681909d /Makefile | |
| parent | 6296fcc8a6691c2450a607eef68af1995ba33f35 (diff) | |
| parent | 3f1d9a6cec011b0a25a5dff5d9e5012a459ef02f (diff) | |
| parent | 1791ff7179f689cb54182a1215686f8138850412 (diff) | |
Merge branches 'kbuild/misc' and 'kbuild/kbuild' into kbuild/for-next