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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 2dc6a03 36f8daf)

author	David S. Miller <davem@davemloft.net>
	Fri, 2 Oct 2015 14:21:25 +0000 (07:21 -0700)
committer	David S. Miller <davem@davemloft.net>
	Fri, 2 Oct 2015 14:21:25 +0000 (07:21 -0700)
commit	f6d3125fa3c2f55ddf7cf69365c41089de6cfae6
tree	ff2bcb135ebf090d7b383d55123b621f4590632c	tree \| snapshot
parent	2dc6a0303b89de4c92b44f5278d61b6b6c9c20eb	commit \| diff
parent	36f8dafe52b0d0726edd5102900e37192f1d3c65	commit \| diff

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

Conflicts:
net/dsa/slave.c

net/dsa/slave.c simply had overlapping changes.

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

12 files changed:

Domain: System / Kernel;