review.tizen.org Git - platform/kernel/linux-rpi.git/commit

projects / platform / kernel / linux-rpi.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b4d9785 0c0ddd6)

author	David S. Miller <davem@davemloft.net>
	Fri, 21 Feb 2020 21:39:34 +0000 (13:39 -0800)
committer	David S. Miller <davem@davemloft.net>
	Fri, 21 Feb 2020 21:39:34 +0000 (13:39 -0800)
commit	e65ee2fb54d4745d7b7d9061d7fe33c5c5bf3b06
tree	04b1728c397ad4604a6163529f51dfd48dfdbc07	tree \| snapshot
parent	b4d9785ce5c035b672f25df56706d0ff4e68b74e	commit \| diff
parent	0c0ddd6ae47c9238c18f475bcca675ca74c9dc31	commit \| diff

Merge git://git./linux/kernel/git/netdev/net

Conflict resolution of ice_virtchnl_pf.c based upon work by
Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>

Domain: System / Kernel;