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

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c0cd2da 949db15)

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Sat, 26 Jan 2013 05:25:02 +0000 (21:25 -0800)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Sat, 26 Jan 2013 05:25:02 +0000 (21:25 -0800)
commit	8f5f90a872c38b4e78f3cc95e8a25434b98e4db2
tree	36c50b0c97286ab89c85016f7ab281f8e843c05c	tree \| snapshot
parent	c0cd2da16b431a2007ea83865f3dd1530c1643a5	commit \| diff
parent	949db153b6466c6f7cad5a427ecea94985927311	commit \| diff

Merge 3.8-rc5 into staging-next

This resolves a merge issue with a iio driver, and the zram code.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

16 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/iio/accel/hid-sensor-accel-3d.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/lp8788_adc.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/max1363.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/gyro/hid-sensor-gyro-3d.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/light/hid-sensor-als.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/magnetometer/hid-sensor-magn-3d.c	diff1 \|	diff2 \|	blob \| history
drivers/rtc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/rtc/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/staging/iio/adc/mxs-lradc.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/omapdrm/omap_gem_dmabuf.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/sb105x/sb_pci_mp.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/vt6656/bssdb.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/vt6656/int.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/wlan-ng/prism2mgmt.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/zram/zram_drv.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree