| commit | ddc39f90a956b1ce49213e057d32fc94253e20f6 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jun 27 07:29:19 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jun 27 07:29:19 2010 -0700 |
| tree | 2027362a1fa0632cd7a797add3545431adfe76f5 | |
| parent | 1929cef46fb057377e43a3d594404f1432db4934 [diff] | |
| parent | 84cc1535cb9043ea1921b81cb086138c0f2dc2b9 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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