]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'aio-direct/for-next'
authorThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:33:02 +0000 (14:33 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:33:02 +0000 (14:33 +0200)
1  2 
fs/btrfs/inode.c
mm/filemap.c

Simple merge
diff --cc mm/filemap.c
Simple merge