[selinux-policy: 2867/3172] Merge with upsteam

[Daniel J Walsh]

commit f00ba23b21318892ed8b8f1605ad0b113a8b7bb6
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Fri Sep 3 17:19:55 2010 -0400

    Merge with upsteam

 policy/modules/admin/alsa.fc        |    2 +-
 policy/modules/kernel/filesystem.fc |    6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/policy/modules/admin/alsa.fc b/policy/modules/admin/alsa.fc
index bc9a97a..72a0458 100644
--- a/policy/modules/admin/alsa.fc
+++ b/policy/modules/admin/alsa.fc
@@ -1,4 +1,4 @@
-HOME_DIR/\.asoundrc		--	gen_context(system_u:object_r:alsa_home_t,s0)
+HOME_DIR/\.asoundrc	--	gen_context(system_u:object_r:alsa_home_t,s0)
 
 /bin/alsaunmute		--	gen_context(system_u:object_r:alsa_exec_t,s0)
 
diff --git a/policy/modules/kernel/filesystem.fc b/policy/modules/kernel/filesystem.fc
index e9a09e1..ff835aa 100644
--- a/policy/modules/kernel/filesystem.fc
+++ b/policy/modules/kernel/filesystem.fc
@@ -1,5 +1,7 @@
 /dev/shm	-d	gen_context(system_u:object_r:tmpfs_t,s0)
 /dev/shm/.*		<<none>>
 
-/cgroup(/.*)? 	 	gen_context(system_u:object_r:cgroup_t,s0)
-/sys/fs/cgroup(/.*)?  	<<none>>
+/cgroup		-d	gen_context(system_u:object_r:cgroup_t,s0)
+/cgroup/.*		<<none>>
+
+/sys/fs/cgroup(/.*)?	<<none>>