OSDN Git Service

am 8c00dae6: am 427c3a21: Make a failure of the BLKDISCARD ioctl non-fatal.
authorKen Sumrall <ksumrall@android.com>
Wed, 23 Mar 2011 03:42:37 +0000 (20:42 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 23 Mar 2011 03:42:37 +0000 (20:42 -0700)
* commit '8c00dae657ce7941121ec218d07adeab9ee3d8a1':
  Make a failure of the BLKDISCARD ioctl non-fatal.


Trivial merge