]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'vfs/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 2 Aug 2013 03:29:34 +0000 (13:29 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 2 Aug 2013 03:29:34 +0000 (13:29 +1000)
commita5ade42c0f403133d921284247a6c5d11fceaf85
tree9db624a824695e1143c5ef798fae1c0626174642
parentd5168b9759d207cc486a2abfd71d6b9d9892304f
parentd405be48a4c3f37f7a8e5648a5db204738272c61
Merge remote-tracking branch 'vfs/for-next'

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