]> git.baikalelectronics.ru Git - kernel.git/commit
Merge 3.17-rc6 into staging-next.
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 22 Sep 2014 14:30:03 +0000 (07:30 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 22 Sep 2014 14:30:03 +0000 (07:30 -0700)
commit87a0545251e9e88dd0201dd282efa2a6fd315a2b
treeea756d49395ac4a08d6cdff98d74e60384a322a6
parentedbaa0dab38c78be093cc8e4ed43796b6ae8bc4e
parent360d1beb3f670534d48788df77bff0dc1a2a35c8
Merge 3.17-rc6 into staging-next.

We want the fixes in there, and it resolves a merge issue with
drivers/iio/accel/bma180.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/iio/accel/bma180.c
drivers/iio/adc/at91_adc.c
drivers/iio/adc/xilinx-xadc-core.c
drivers/staging/vt6655/hostap.c