Merge remote branch 'origin/master' into kernel-git

Browse Source

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.

...

This commit is contained in:

Kyle McMartin 2011-01-22 13:36:33 -05:00

parent e6636acec4 c496c71d98

commit 91e1012aed

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available