summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/boot
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-06-27 16:29:19 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-06-27 16:29:19 +0200
commitddc39f90a956b1ce49213e057d32fc94253e20f6 (patch)
tree2027362a1fa0632cd7a797add3545431adfe76f5 /arch/powerpc/boot
parentMerge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po... (diff)
parentalpha: Fix de2104x driver failing to readout MAC address correctly (diff)
downloadlinux-ddc39f90a956b1ce49213e057d32fc94253e20f6.tar.xz
linux-ddc39f90a956b1ce49213e057d32fc94253e20f6.zip
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
Diffstat (limited to 'arch/powerpc/boot')
0 files changed, 0 insertions, 0 deletions