diff options
| author | Michal Marek <mmarek@suse.cz> | 2013-06-14 16:04:54 +0200 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2013-06-14 16:04:54 +0200 |
| commit | 2d7d88bd1b7f1d2455a654ed13aa6401efc4e979 (patch) | |
| tree | 3c83fbf187253caec3e64d523b22e9057ea3fdb3 /scripts | |
| parent | ed553175a29ce50f3374f31ee3702e044592e996 (diff) | |
| parent | 1c00a47e48d1bad3ca60c4e923d51c4ac6add5b5 (diff) | |
| parent | 61cb48c3f93adee633f996dd40ff5267fae55b3a (diff) | |
Merge branches 'kbuild/kbuild' and 'kbuild/misc' into kbuild/for-next