[kernel/rawhide/user/steved/pnfs-rawhide: 50/50] Merge branch 'rawhide/user/steved/pnfs-rawhide' of ssh://pkgs.fedoraproject.org/kernel into rawhide/

[Steve Dickson]

commit 64bf207a9a519935fb0f2b9e61719600b68371a0
Merge: 5c72012 9ad467a
Author: Steve Dickson <steved at redhat.com>
Date:   Thu Sep 30 08:04:17 2010 -0400

    Merge branch 'rawhide/user/steved/pnfs-rawhide' of ssh://pkgs.fedoraproject.org/kernel into rawhide/user/steved/pnfs-rawhide
    
    Conflicts:
    	kernel.spec

---