Merge branch 'android-tegra-3.10' into android-tegra-flounder-3.10-n-preview 3c71420 BACKPORT: f2fs: add a max block check for get_data_block_bmap 2564b24 fuse: Add support for d_canonical_path 1201271 vfs: change d_canonical_path to take two paths Conflicts resolved in fs/f2fs/data.c and fs/f2fs/super.c to match closer to upstream. Change-Id: I420946e9427d15c61bdd7e1e0b518b85241738c4 Signed-off-by: Greg Hackmann <[email protected]> Bug: 28271368 Bug: 23904372