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: 4a38cc5 e00fb3f)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 30 Sep 2011 02:18:48 +0000 (12:18 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 30 Sep 2011 02:18:48 +0000 (12:18 +1000)
commit	9f4b353895dd577a2914d21e871f7548229cf7e9
tree	d9d5be4f65a9e302f5c3b8f502be2f8dcaed1e32	tree \| snapshot
parent	4a38cc55281d43cbfb7b434d95e41906f4378135	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