git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Wed, 25 Sep 2013 15:59:04 +0000 (08:59 -0700)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Wed, 25 Sep 2013 15:59:04 +0000 (08:59 -0700)
commit	e2aad1d5716c5f7fa5deb4a96e6b6a4e9f24e78b
tree	389fbdf161a3c28c9b2f98fdc1ccd89d474ef884	tree \| snapshot
parent	3ffdea3feca9e2c95c2e93e217d77c9c368f747a	commit \| diff
parent	4a10c2ac2f368583138b774ca41fac4207911983	commit \| diff

Merge 3.12-rc2 into staging-next.

This resolves the merge problem with two iio drivers that Stephen
Rothwell pointed out.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

18 files changed:

drivers/iio/accel/bma180.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/at91_adc.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/buffer_cb.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/dac/mcp4725.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/iio_core.h	diff1 \|	diff2 \|	blob \| history
drivers/iio/industrialio-buffer.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/industrialio-core.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/industrialio-event.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/temperature/tmp006.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/dgap/dgap_driver.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/dgnc/dgnc_driver.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/iio/light/isl29018.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/iio/magnetometer/hmc5843.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/iio/meter/ade7854-spi.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8188eu/core/rtw_wlan_util.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8188eu/include/odm.h	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree

RSS Atom

drivers/iio/accel/bma180.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/at91_adc.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/buffer_cb.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/dac/mcp4725.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/iio_core.h	diff1 \|	diff2 \|	blob \| history
drivers/iio/industrialio-buffer.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/industrialio-core.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/industrialio-event.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/temperature/tmp006.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/dgap/dgap_driver.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/dgnc/dgnc_driver.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/iio/light/isl29018.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/iio/magnetometer/hmc5843.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/iio/meter/ade7854-spi.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8188eu/core/rtw_wlan_util.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8188eu/include/odm.h	diff1 \|	diff2 \|	blob \| history