OSDN Git Service

Merge branch 'iio-backport' into android-4.0
authorChih-Wei Huang <cwhuang@linux.org.tw>
Mon, 13 Apr 2015 16:48:32 +0000 (00:48 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Mon, 13 Apr 2015 16:48:32 +0000 (00:48 +0800)

Trivial merge