]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'vfs/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 22 Aug 2013 01:52:00 +0000 (11:52 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 22 Aug 2013 01:52:00 +0000 (11:52 +1000)
commite75c65f6e64394253c7f7e218b0442f40c77c9a4
treec27e6afd7cd01011041e755c3815ca16ca0e00c5
parent1e23f4bd3e5d58ae4a03aec783d129845b59642d
parentd405be48a4c3f37f7a8e5648a5db204738272c61
Merge remote-tracking branch 'vfs/for-next'

Conflicts:
fs/ext4/namei.c
mm/shmem.c
arch/x86/ia32/ia32_aout.c
fs/binfmt_aout.c
fs/binfmt_elf.c
fs/coredump.c