diff options
| author | Kyle McMartin <kyle@redhat.com> | 2011-01-22 13:36:33 -0500 |
|---|---|---|
| committer | Kyle McMartin <kyle@redhat.com> | 2011-01-22 13:36:33 -0500 |
| commit | 91e1012aed060fa13824a80ed74dc3f0cc81f6d8 (patch) | |
| tree | 39800a0f3b440eb951b2e3037ae9533b0e335bd4 /scripts | |
| parent | e6636acec46b79cd20b1bc5ee4f1f62e7fb54471 (diff) | |
| parent | c496c71d9831cb7ce4a2767b89660b501278d781 (diff) | |
| download | kernel-91e1012aed060fa13824a80ed74dc3f0cc81f6d8.tar.gz kernel-91e1012aed060fa13824a80ed74dc3f0cc81f6d8.tar.xz kernel-91e1012aed060fa13824a80ed74dc3f0cc81f6d8.zip | |
Merge remote branch 'origin/master' into kernel-git
Squash rawhide branch into the kernel-git branch so it
can be pulled back into the master branch. Merge is made
by
% git merge -s ours --no-commit origin/master
and then merged back directly into origin/master.
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions