]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e49e045 1112bfb)
Merge branch 'uek2-stable-enic2' of git://ca-git.us.oracle.com/linux-chander-public...
authorGuru Anbalagane <guru.anbalagane@oracle.com>
Wed, 8 Feb 2012 05:38:44 +0000 (21:38 -0800)
committerGuru Anbalagane <guru.anbalagane@oracle.com>
Wed, 8 Feb 2012 05:38:44 +0000 (21:38 -0800)
Conflicts:
drivers/net/ixgbe/ixgbe_82599.c

Signed-off-by: Guru Anbalagane <guru.anbalagane@oracle.com>
1  2 
drivers/net/ixgbe/ixgbe_common.c patch | diff1 | diff2 | blob | history

diff --cc drivers/net/ixgbe/ixgbe_common.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.