diff options
| author | Michal Marek <mmarek@suse.cz> | 2014-05-14 22:50:39 +0200 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2014-05-14 22:50:39 +0200 |
| commit | 5366c855e0d8646bcdb5a6e5286cbf300688859f (patch) | |
| tree | d80efdec5b905464608e612a0b3212d7f2f5fd73 | |
| parent | 4fc90e122992b030b7ffe69161aa89d8630b8e75 (diff) | |
| parent | 79c704a87834164259b7aa7469d426d6ba351eec (diff) | |
| parent | 9da0763bdd82572be243fcf5161734f11568960f (diff) | |
Merge branches 'kbuild/misc' and 'kbuild/kbuild' into kbuild/for-next