git.agner.ch Git - linux-drm-fsl-dcu.git/commit

projects / linux-drm-fsl-dcu.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c3cce6c 1081230)

author	NeilBrown <neilb@suse.com>
	Sat, 5 Sep 2015 09:07:04 +0000 (11:07 +0200)
committer	NeilBrown <neilb@suse.com>
	Sat, 5 Sep 2015 09:08:32 +0000 (11:08 +0200)
commit	e89c6fdf9e0eb1b5a03574d4ca73e83eae8deb91
tree	f9df292ed03a5a3c4ddc658ae3646f02a1ffafce	tree \| snapshot
parent	c3cce6cda162eb2b2960a85d9c8992f4f3be85d0	commit \| diff
parent	1081230b748de8f03f37f80c53dfa89feda9b8de	commit \| diff

Merge linux-block/for-4.3/core into md/for-linux

There were a few conflicts that are fairly easy to resolve.

Signed-off-by: NeilBrown <neilb@suse.com>

drivers/md/md.c	diff1 \|	diff2 \|	blob \| history
drivers/md/raid0.c	diff1 \|	diff2 \|	blob \| history
drivers/md/raid1.c	diff1 \|	diff2 \|	blob \| history
drivers/md/raid10.c	diff1 \|	diff2 \|	blob \| history
drivers/md/raid5.c	diff1 \|	diff2 \|	blob \| history

Freescale DCU DRM driver