]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'aio/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 06:29:26 +0000 (16:29 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 06:29:26 +0000 (16:29 +1000)
1  2 
fs/aio.c

diff --cc fs/aio.c
Simple merge