Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.24
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 3 Dec 2007 23:46:37 +0000 (15:46 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 3 Dec 2007 23:46:37 +0000 (15:46 -0800)
commitc5ef91eee5015cc968996fb0d2974cbc41e4eccd
tree9c8648ab4e6326e56e3fcbc6811baf998c963b5a
parenta6733f2e146a5f4884bc23023bf56f3a2698b547
parentb0d98dc504c3f29cc4647fff87a5061be5f0f3d7
Merge git://git./linux/kernel/git/lethal/sh-2.6.24

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.24:
  sh: Support PCI IO access of SH7780 base boards.
  sh: Fix PCI IO space base address of SH7780.