[kernel: 23/25] Merge remote branch 'origin/master' into kernel-git

[Kyle McMartin]

commit 91e1012aed060fa13824a80ed74dc3f0cc81f6d8
Merge: e6636ac c496c71
Author: Kyle McMartin <kyle at redhat.com>
Date:   Sat Jan 22 13:36:33 2011 -0500

    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.

---