tree c490e02cc35548e23e9408620e288aa6b87e9282
parent 6ae7d6f0195a0ec7e5d07821e62c79898cd33fdc
parent 34466c5be4dd1490acf98e6d2ff8f3728d8ca5c1
author Linus Torvalds <torvalds@linux-foundation.org> 1248997520 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1248997520 -0700

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: Update defconfigs for embedded 6xx/7xxx, 8xx, 8{3,5,6}xxx
  powerpc/86xx: Update GE Fanuc sbc310 default configuration
  powerpc/86xx: Update defconfig for GE Fanuc's PPC9A
  cpm_uart: Don't use alloc_bootmem in cpm_uart_cpm2.c
  powerpc/83xx: Fix PCI IO base address on MPC837xE-RDB boards
  powerpc/85xx: Don't scan for TBI PHY addresses on MPC8569E-MDS boards
  powerpc/85xx: Fix ethernet link detection on MPC8569E-MDS boards
  powerpc/mm: Fix SMP issue with MMU context handling code