git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Greg Kroah-Hartman <gregkh@suse.de>
	Sat, 10 Dec 2011 03:01:27 +0000 (19:01 -0800)
committer	Greg Kroah-Hartman <gregkh@suse.de>
	Sat, 10 Dec 2011 03:01:27 +0000 (19:01 -0800)
commit	68de173072fcdce3409f374f0cf1a1c48fe81046
tree	3b41623f7174f1bee5b31853d2b295028cf9e376	tree \| snapshot
parent	3514f8ad6bbd181ac8d2554320b0eda287b8a6cd	commit \| diff
parent	45ecffbc96ef14e9a3c05bd396ac8856afde9dd5	commit \| diff

Merge 3.2-rc5 into staging-next

This resolves the conflict in the
drivers/staging/iio/industrialio-core.c file due to two different
changes made to resolve the same problem.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Linux Kernel Source Tree.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/staging/comedi/comedi_fops.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/comedi/drivers/usbduxsigma.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/iio/industrialio-core.c	diff1 \|	diff2 \|	blob \| history