diff options
| author | Michal Marek <mmarek@suse.cz> | 2013-08-13 22:50:13 +0200 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2013-08-13 22:50:13 +0200 |
| commit | b805756d7d15f66be311884cd65f9bab611f894c (patch) | |
| tree | 46c8d3d0b69946432df2765e7dce8da534642c6f /scripts | |
| parent | 8de6aeb7b3c83a870078fcbf561923c268690168 (diff) | |
| parent | 4f9879f6c6454f255cb81b7a34dd35e355679f4b (diff) | |
| parent | 46b5c9b856e8bcb44d8570cc55c46d19ca2428ff (diff) | |
Merge branches 'kbuild/kbuild' and 'kbuild/misc' into kbuild/for-next