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

Conflicts:
	kernel.spec
This commit is contained in:
Steve Dickson 2010-09-29 18:12:31 -04:00
commit 853d932874
1 changed files with 3 additions and 0 deletions

View File

@ -2153,6 +2153,9 @@ fi
* Thu Aug 19 2010 Steve Dickson <steved@redhat.com>
- Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19
* Thu Aug 19 2010 Steve Dickson <steved@redhat.com>
- Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19
* Wed Aug 18 2010 Dave Jones <davej@redhat.com>
- systemd is dependant upon autofs, so build it in instead of modular.