tree fe710c7ce72fd0f6601413f60dd409731a82cc8a
parent 2016fbeddbe7d2879b4bf6285c171fe272a9de7a
parent 54b217e18dff4402c100125cf47bc67e86062791
author Elliott Hughes <enh@google.com> 1373303595 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1373303595 -0700

am 54b217e1: am 47321770: Merge "Update linux/fs.h."

* commit '54b217e18dff4402c100125cf47bc67e86062791':
  Update linux/fs.h.