Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mfleming/sh-2.6
authorPaul Mundt <lethal@linux-sh.org>
Fri, 2 Jul 2010 04:06:56 +0000 (13:06 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Fri, 2 Jul 2010 04:06:56 +0000 (13:06 +0900)
commit7ec96d446aee72910dab1852dab77b9b18974c45
tree685401953cd1b7db5482b4e0b04a6353c2e0d12f
parent12462d77ec78be9fb033580b7b64ddf9d0fee44b
parent3b554c33dcde9d67efcb8d0a5acca201afd44730
Merge branch 'master' of /linux/kernel/git/mfleming/sh-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mfleming/sh-2.6:
  sh: Fix typos in PCI initialization message