From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 27 Jun 2010 14:29:19 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88... 
X-Git-Tag: firefly_0821_release~9833^2~1508
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ddc39f90a956b1ce49213e057d32fc94253e20f6;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linus' of git://git./linux/kernel/git/mattst88/alpha-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
  alpha: Fix de2104x driver failing to readout MAC address correctly
  alpha: Detect Super IO chip, no IDE on Avanti, enable EPP19
  alpha: fix pci_mmap_resource API breakage
  alpha: fix __arch_hweight32 typo
---

ddc39f90a956b1ce49213e057d32fc94253e20f6