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: 150b45e 5dbe304)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 13 Sep 2011 04:20:52 +0000 (14:20 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 13 Sep 2011 04:20:52 +0000 (14:20 +1000)
commit	d551bf3a3ce3be1481d5876583d365ce8e48de82
tree	f5b48cc4c855e9af38f7441a50eaabd32c1e7f1f	tree \| snapshot
parent	150b45e861ed599689c187f0f390a2d8476d1d47	commit \| diff
parent	5dbe3040c74eef18e66951347eda05b153e69328	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
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

Linux kernel for KaRo TX COM modules