]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(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)
commit101b5dd86ee25a1d397a22f5cca2649bdd18cc94
tree470e5bd4e5d8bedd3986bbccda81ad1d2c5d428atree
parente49e045d0395ce758d0250a3da6ba43310b039b4commit | diff
parent1112bfb2681fa71723e77e495ccb6a1a5e167cd2commit | diff
Merge branch 'uek2-stable-enic2' of git://ca-git.us.oracle.com/linux-chander-public into uek2-stable

Conflicts:
drivers/net/ixgbe/ixgbe_82599.c

Signed-off-by: Guru Anbalagane <guru.anbalagane@oracle.com>
drivers/net/ixgbe/ixgbe_common.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.