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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 1bb4238 15ba223)

author	David S. Miller <davem@davemloft.net>
	Tue, 22 Jul 2014 07:44:59 +0000 (00:44 -0700)
committer	David S. Miller <davem@davemloft.net>
	Tue, 22 Jul 2014 07:44:59 +0000 (00:44 -0700)
commit	8fd90bb889635fa1e7f80a3950948cc2e74c1446
tree	1490343b5ad9f88b9333e53fa9457c00cbf6c2d1	tree \| snapshot
parent	1bb4238b17b5de6cdc120970a9d00dd8a44f40df	commit \| diff
parent	15ba2236f3556fc01b9ca91394465152b5ea74b6	commit \| diff

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

Conflicts:
drivers/infiniband/hw/cxgb4/device.c

The cxgb4 conflict was simply overlapping changes.

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

Domain: System / Kernel; Licenses: GPL-2.0;