]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'userns/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 2 Oct 2012 05:33:39 +0000 (15:33 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 2 Oct 2012 05:33:44 +0000 (15:33 +1000)
commitc444bf7fb30cb1969cba355c1bb8e954742b5fc8
tree1f0741634639b19d1225120e37116519d7057f1a
parent1ccb071ebfc6cfad3598e4745c4551e12cb6c356
parent72235465864d84cedb2d9f26f8e1de824ee20339
Merge remote-tracking branch 'userns/for-next'

Conflicts:
fs/ubifs/debug.c
init/Kconfig
kernel/audit.c
kernel/auditsc.c
security/integrity/ima/ima_policy.c
72 files changed:
arch/alpha/kernel/osf_sys.c
arch/ia64/kernel/perfmon.c
arch/powerpc/mm/fault.c
arch/s390/hypfs/inode.c
arch/s390/kernel/compat_linux.c
drivers/staging/android/binder.c
drivers/usb/gadget/f_fs.c
drivers/usb/gadget/inode.c
fs/adfs/super.c
fs/affs/super.c
fs/befs/linuxvfs.c
fs/bfs/inode.c
fs/btrfs/delayed-inode.c
fs/btrfs/inode.c
fs/btrfs/ioctl.c
fs/debugfs/inode.c
fs/ecryptfs/main.c
fs/exofs/inode.c
fs/ext3/super.c
fs/ext4/super.c
fs/fat/inode.c
fs/gfs2/quota.c
fs/hfs/inode.c
fs/hfs/super.c
fs/hpfs/super.c
fs/hugetlbfs/inode.c
fs/isofs/inode.c
fs/jfs/jfs_incore.h
fs/jfs/super.c
fs/logfs/inode.c
fs/logfs/readwrite.c
fs/minix/inode.c
fs/nfsd/vfs.c
fs/ntfs/super.c
fs/open.c
fs/proc/base.c
fs/qnx4/inode.c
fs/qnx6/inode.c
fs/quota/dquot.c
fs/reiserfs/inode.c
fs/sysv/inode.c
fs/ubifs/budget.c
fs/ubifs/debug.c
fs/ubifs/sb.c
fs/ubifs/super.c
fs/ubifs/ubifs.h
fs/udf/inode.c
fs/udf/super.c
fs/xattr.c
include/drm/drmP.h
include/linux/audit.h
include/linux/init_task.h
include/linux/sched.h
include/linux/security.h
include/linux/tty.h
include/net/xfrm.h
init/Kconfig
kernel/audit.c
kernel/audit_watch.c
kernel/auditsc.c
kernel/taskstats.c
kernel/trace/trace.c
kernel/trace/trace.h
net/core/dev.c
net/netlabel/netlabel_unlabeled.c
net/xfrm/xfrm_policy.c
net/xfrm/xfrm_state.c
net/xfrm/xfrm_user.c
security/integrity/ima/ima_policy.c
security/keys/key.c
security/keys/keyctl.c
security/security.c