]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7677870 7223546)
Merge remote-tracking branch 'userns/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 25 Sep 2012 07:18:02 +0000 (17:18 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 25 Sep 2012 07:18:06 +0000 (17:18 +1000)
commit8f0e3ce9a766fc90859433487e1a6648a054de16
tree3685d659d5ff30b972d71b5e621bd4a2c30a6785tree | snapshot
parent76778708a37f516e3d391e8d00faffdb7f14e6a5commit | diff
parent72235465864d84cedb2d9f26f8e1de824ee20339commit | 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