summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-04 11:23:59 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-04 11:23:59 -0700
commitd5fc1d517543857ea117fc57f23b394aa9784f06 (patch)
tree7d50d71d585ae10ff0601fc4d940680fbc1734ab /drivers/net
parent694f690d27dadccc8cb9d90532e76593b61fe098 (diff)
parentc4799c7570475352c8c5de82ae938f7a02f206fa (diff)
downloadtalos-obmc-linux-d5fc1d517543857ea117fc57f23b394aa9784f06.tar.gz
talos-obmc-linux-d5fc1d517543857ea117fc57f23b394aa9784f06.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: amd64_edac: Minor formatting fix amd64_edac: Fix operator precendence error edac, mc: Improve scrub rate handling amd64_edac: Correct scrub rate setting amd64_edac: Fix DCT base address selector amd64_edac: Remove polling mechanism x86, mce: Notify about corrected events too amd64_edac: Remove unneeded defines edac: Remove EDAC_DEBUG_VERBOSE amd64_edac: Sanitize syndrome extraction
Diffstat (limited to 'drivers/net')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud