tree 546cbeb9426ea8da2219fdf84b798ee8a203d715
parent 5687abe6ef0fe5820547cf68bbcec9c968c28870
parent 869cc685b171c5c0c1efbad5df693cfaebe0af43
author The Android Open Source Project <initial-contribution@android.com> 1279312254 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279312254 -0700

am 869cc685: merge from open-source master

Merge commit '869cc685b171c5c0c1efbad5df693cfaebe0af43'

* commit '869cc685b171c5c0c1efbad5df693cfaebe0af43':
  fix insmod reading more than one module parameter