summaryrefslogtreecommitdiffstats
path: root/drivers/net/cnic.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-11-25 17:57:01 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-11-25 17:57:01 -0800
commit08e627b5cee12ca63de60aae2cc30af2028f6159 (patch)
treedbd9f9c5b56da52c2db287a3c34808125846e0d0 /drivers/net/cnic.c
parentc2a65d3d85a08b6c93da7b8664c89d1cd0682adf (diff)
parente716e014384688d1a50d1aa5213ee74748c6d4e0 (diff)
downloadlinux-08e627b5cee12ca63de60aae2cc30af2028f6159.tar.bz2
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull powerpc EEH bugfixes from Benjamin Herrenschmidt. Two one-liner fixes for the new EEH code. * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/eeh: Do not invalidate PE properly powerpc/pseries: Fix oops with MSIs when missing EEH PEs
Diffstat (limited to 'drivers/net/cnic.c')
0 files changed, 0 insertions, 0 deletions