git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 27 Sep 2012 06:10:40 +0000 (16:10 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 27 Sep 2012 06:10:44 +0000 (16:10 +1000)
commit	7ba5a7849ec6d2cf3ebb8eb674042ebb67d8c945
tree	e67ac1afe5e90995d311689361f806491acb87ba	tree \| snapshot
parent	d1c4a9cdbbac840f2b0244b244d5487bb450f4b8	commit \| diff
parent	72235465864d84cedb2d9f26f8e1de824ee20339	commit \| diff

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

56 files changed:

arch/alpha/kernel/osf_sys.c	diff1 \|	diff2 \|	blob \| history
arch/ia64/kernel/perfmon.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/fault.c	diff1 \|	diff2 \|	blob \| history
arch/s390/kernel/compat_linux.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/android/binder.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/f_fs.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/inode.c	diff1 \|	diff2 \|	blob \| history
fs/affs/super.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/delayed-inode.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/inode.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/ioctl.c	diff1 \|	diff2 \|	blob \| history
fs/debugfs/inode.c	diff1 \|	diff2 \|	blob \| history
fs/ecryptfs/main.c	diff1 \|	diff2 \|	blob \| history
fs/exofs/inode.c	diff1 \|	diff2 \|	blob \| history
fs/ext3/super.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/super.c	diff1 \|	diff2 \|	blob \| history
fs/gfs2/quota.c	diff1 \|	diff2 \|	blob \| history
fs/hfs/inode.c	diff1 \|	diff2 \|	blob \| history
fs/jfs/jfs_incore.h	diff1 \|	diff2 \|	blob \| history
fs/jfs/super.c	diff1 \|	diff2 \|	blob \| history
fs/logfs/inode.c	diff1 \|	diff2 \|	blob \| history
fs/logfs/readwrite.c	diff1 \|	diff2 \|	blob \| history
fs/nfsd/vfs.c	diff1 \|	diff2 \|	blob \| history
fs/open.c	diff1 \|	diff2 \|	blob \| history
fs/proc/base.c	diff1 \|	diff2 \|	blob \| history
fs/quota/dquot.c	diff1 \|	diff2 \|	blob \| history
fs/reiserfs/inode.c	diff1 \|	diff2 \|	blob \| history
fs/ubifs/budget.c	diff1 \|	diff2 \|	blob \| history
fs/ubifs/debug.c	diff1 \|	diff2 \|	blob \| history
fs/ubifs/sb.c	diff1 \|	diff2 \|	blob \| history
fs/ubifs/super.c	diff1 \|	diff2 \|	blob \| history
fs/ubifs/ubifs.h	diff1 \|	diff2 \|	blob \| history
fs/udf/inode.c	diff1 \|	diff2 \|	blob \| history
fs/udf/super.c	diff1 \|	diff2 \|	blob \| history
fs/xattr.c	diff1 \|	diff2 \|	blob \| history
include/linux/audit.h	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
include/linux/security.h	diff1 \|	diff2 \|	blob \| history
include/linux/tty.h	diff1 \|	diff2 \|	blob \| history
include/net/xfrm.h	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
kernel/audit.c	diff1 \|	diff2 \|	blob \| history
kernel/audit_watch.c	diff1 \|	diff2 \|	blob \| history
kernel/auditsc.c	diff1 \|	diff2 \|	blob \| history
kernel/taskstats.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/netlabel/netlabel_unlabeled.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_policy.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_state.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_user.c	diff1 \|	diff2 \|	blob \| history
security/integrity/ima/ima_policy.c	diff1 \|	diff2 \|	blob \| history
security/keys/key.c	diff1 \|	diff2 \|	blob \| history
security/keys/keyctl.c	diff1 \|	diff2 \|	blob \| history
security/security.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules

RSS Atom

arch/alpha/kernel/osf_sys.c	diff1 \|	diff2 \|	blob \| history
arch/ia64/kernel/perfmon.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/fault.c	diff1 \|	diff2 \|	blob \| history
arch/s390/kernel/compat_linux.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/android/binder.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/f_fs.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/inode.c	diff1 \|	diff2 \|	blob \| history
fs/affs/super.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/delayed-inode.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/inode.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/ioctl.c	diff1 \|	diff2 \|	blob \| history
fs/debugfs/inode.c	diff1 \|	diff2 \|	blob \| history
fs/ecryptfs/main.c	diff1 \|	diff2 \|	blob \| history
fs/exofs/inode.c	diff1 \|	diff2 \|	blob \| history
fs/ext3/super.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/super.c	diff1 \|	diff2 \|	blob \| history
fs/gfs2/quota.c	diff1 \|	diff2 \|	blob \| history
fs/hfs/inode.c	diff1 \|	diff2 \|	blob \| history
fs/jfs/jfs_incore.h	diff1 \|	diff2 \|	blob \| history
fs/jfs/super.c	diff1 \|	diff2 \|	blob \| history
fs/logfs/inode.c	diff1 \|	diff2 \|	blob \| history
fs/logfs/readwrite.c	diff1 \|	diff2 \|	blob \| history
fs/nfsd/vfs.c	diff1 \|	diff2 \|	blob \| history
fs/open.c	diff1 \|	diff2 \|	blob \| history
fs/proc/base.c	diff1 \|	diff2 \|	blob \| history
fs/quota/dquot.c	diff1 \|	diff2 \|	blob \| history
fs/reiserfs/inode.c	diff1 \|	diff2 \|	blob \| history
fs/ubifs/budget.c	diff1 \|	diff2 \|	blob \| history
fs/ubifs/debug.c	diff1 \|	diff2 \|	blob \| history
fs/ubifs/sb.c	diff1 \|	diff2 \|	blob \| history
fs/ubifs/super.c	diff1 \|	diff2 \|	blob \| history
fs/ubifs/ubifs.h	diff1 \|	diff2 \|	blob \| history
fs/udf/inode.c	diff1 \|	diff2 \|	blob \| history
fs/udf/super.c	diff1 \|	diff2 \|	blob \| history
fs/xattr.c	diff1 \|	diff2 \|	blob \| history
include/linux/audit.h	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
include/linux/security.h	diff1 \|	diff2 \|	blob \| history
include/linux/tty.h	diff1 \|	diff2 \|	blob \| history
include/net/xfrm.h	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
kernel/audit.c	diff1 \|	diff2 \|	blob \| history
kernel/audit_watch.c	diff1 \|	diff2 \|	blob \| history
kernel/auditsc.c	diff1 \|	diff2 \|	blob \| history
kernel/taskstats.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/netlabel/netlabel_unlabeled.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_policy.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_state.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_user.c	diff1 \|	diff2 \|	blob \| history
security/integrity/ima/ima_policy.c	diff1 \|	diff2 \|	blob \| history
security/keys/key.c	diff1 \|	diff2 \|	blob \| history
security/keys/keyctl.c	diff1 \|	diff2 \|	blob \| history
security/security.c	diff1 \|	diff2 \|	blob \| history