From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 9 Mar 2007 22:22:35 +0000 (-0800)
Subject: Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc
X-Git-Tag: v2.6.21-rc4~65
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a967e127d0233f2472af64597de3f3920872310c;p=linux-2.6

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

* 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] 85xx: Enable CONFIG_SERIAL_8250_SHARE_IRQ
  [POWERPC] Select u-image as default image for Linkstation
  [POWERPC] 83xx: Minor fixes for 834x_mds USB setup code
  [POWERPC] Fix warning in powermac pci.c
  [POWERPC] Fix warning in powermac feature.c
  [POWERPC] Fix warning in prom_parse.c of_irq_map_oldworld()
  [POWERPC] Celleb: bug fix caused by not casting pointer types
  [POWERPC] Add missing newline in xmon help output
  [POWERPC] No DEEPNAP on 970MP 1.0
---

a967e127d0233f2472af64597de3f3920872310c