Diff reduce
Merge branch 'atf' into isilon-atf