]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'vfs/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Jul 2013 01:07:58 +0000 (11:07 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Jul 2013 01:07:58 +0000 (11:07 +1000)
Conflicts:
fs/ext4/namei.c

1  2 
arch/x86/ia32/ia32_aout.c
fs/binfmt_aout.c
fs/binfmt_elf.c
fs/coredump.c

Simple merge
Simple merge
diff --cc fs/binfmt_elf.c
Simple merge
diff --cc fs/coredump.c
Simple merge