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

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

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 77a6c0a e00fb3f)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 29 Sep 2011 03:52:11 +0000 (13:52 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 29 Sep 2011 03:52:11 +0000 (13:52 +1000)
commit	81f2c4966e9b6e52d93b0aebce837d452d7bd8b4
tree	085dd7c1d9ada5c8ad165cf7c2f3ddae774790e4	tree \| snapshot
parent	77a6c0aba90e723360e76e6e73fb74ccf82e2760	commit \| diff
parent	e00fb3f7af111d1b3252f7d622213d2e22be65f5	commit \| diff

Merge remote-tracking branch 'security/next'

Conflicts:
fs/ocfs2/xattr.c

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/char/tpm/tpm.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/xattr.c	diff1 \|	diff2 \|	blob \| history
fs/gfs2/inode.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_iops.c	diff1 \|	diff2 \|	blob \| history
kernel/cred.c	diff1 \|	diff2 \|	blob \| history
security/tomoyo/common.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules