]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'aio/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Apr 2014 04:49:42 +0000 (14:49 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Apr 2014 04:49:42 +0000 (14:49 +1000)
1  2 
fs/aio.c

diff --cc fs/aio.c
Simple merge