tree aa4b396932957d72300dadb080566df5ce4d14c1
parent f100353ff5bfd83be00ae55e98b4d611d2eb5681
parent f93c7c5aab8d5efaf99c88c8452d9303baabc89b
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1191018783 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1191018783 -0700

Merge branch 'for-2.6.23' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc

* 'for-2.6.23' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc:
  [POWERPC] mpc8349emitx.dts: Setup USB-DR for peripheral mode.
  [POWERPC] Fix mpc834x USB-MPH configuration.
  [POWERPC] Fix cpm_uart driver for cpm1 machines
  [PPC] Fix cpm_dpram_addr returning phys mem instead of virt mem
  [POWERPC] Fix copy'n'paste typo in commproc.c