]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5d8593e) | patch
staging: iio: fix up merge error
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 22 Sep 2014 14:54:10 +0000 (07:54 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 22 Sep 2014 14:54:10 +0000 (07:54 -0700)
commit528930703cdfbb3ea79d339d4c1d18b127a61ff2
tree85e3c6907fce6a83440cce2f7b5e759051966138tree | snapshot
parent5d8593eb079df77997427618926c1729c4cdea0ecommit | diff
staging: iio: fix up merge error

Fix up a build merge error in drivers/iio/accel/bma180.c that I caused.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/iio/accel/bma180.c diff | blob | history
Linux Kernel Source Tree.