git.stricted.de - GitHub/LineageOS/G12/android_kernel_amlogic_linux-4.9.git/commit

projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: be6800a 3ff195b)

author	NeilBrown <neilb@suse.de>
	Fri, 21 May 2010 22:31:36 +0000 (08:31 +1000)
committer	NeilBrown <neilb@suse.de>
	Fri, 21 May 2010 22:31:36 +0000 (08:31 +1000)
commit	19fdb9eefb21b72edbc365b838502780c392bad6
tree	deae04c48532d6eab64ed4b0396737bb854b5506	tree \| snapshot (tar.gz zip)
parent	be6800a73aa2f3dc14744c3b80e676d189789f04	commit \| diff
parent	3ff195b011d7decf501a4d55aeed312731094796	commit \| diff

Merge commit '3ff195b011d7decf501a4d55aeed312731094796' into for-linus

Conflicts:
drivers/md/md.c

- Resolved conflict in md_update_sb
- Added extra 'NULL' arg to new instance of sysfs_get_dirent.

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

drivers/md/bitmap.c	diff1 \|	diff2 \|	blob \| history
drivers/md/faulty.c	diff1 \|	diff2 \|	blob \| history
drivers/md/linear.c	diff1 \|	diff2 \|	blob \| history
drivers/md/md.c	diff1 \|	diff2 \|	blob \| history
drivers/md/multipath.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