]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge tag 'v4.1.10-18#bug22013781v1' of git://ca-git.us.oracle.com/linux-etzhao-publi...
authorSantosh Shilimkar <santosh.shilimkar@oracle.com>
Fri, 23 Oct 2015 16:24:38 +0000 (09:24 -0700)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Fri, 23 Oct 2015 16:24:38 +0000 (09:24 -0700)
1  2 
drivers/net/ethernet/broadcom/cnic.c
drivers/net/ethernet/broadcom/cnic_if.h

Simple merge