]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.5/core' into for-next
authorJens Axboe <axboe@kernel.dk>
Fri, 20 Apr 2012 08:20:16 +0000 (10:20 +0200)
committerJens Axboe <axboe@kernel.dk>
Fri, 20 Apr 2012 08:20:16 +0000 (10:20 +0200)
1  2 
fs/splice.c

diff --cc fs/splice.c
Simple merge