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

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

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 27 Jun 2014 03:30:22 +0000 (13:30 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 27 Jun 2014 03:30:22 +0000 (13:30 +1000)
commit	e8cd7ab9081d7aaac059da7baf6712ba4221bbf6
tree	bdda26dbd55fe660a0d48d83f7911e0bcf928b94	tree \| snapshot
parent	7665441f8d0ad790754e870485e93fdcd7d8b478	commit \| diff
parent	3efe1ac78e996da8e141b86667cc15758aad4366	commit \| diff

Merge remote-tracking branch 'userns/for-next'

Conflicts:
fs/btrfs/ioctl.c
fs/dcache.c
fs/namei.c
fs/namespace.c

13 files changed:

Linux kernel for KaRo TX COM modules