Merge master.kernel.org:/pub/scm/linux/kernel/git/dwmw2/audit-2.6

diff --cc MAINTAINERS
Simple merge

diff --cc arch/ppc64/kernel/asm-offsets.c
Simple merge

diff --cc arch/ppc64/kernel/entry.S
Simple merge

diff --cc fs/namei.c
Simple merge

diff --cc kernel/audit.c
Simple merge

diff --cc security/selinux/avc.c
Simple merge

diff --cc security/selinux/hooks.c
Simple merge

diff --cc security/selinux/ss/services.c
Simple merge