]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 12 May 2008 14:28:37 +0000 (07:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 12 May 2008 14:28:37 +0000 (07:28 -0700)
commit78d884aafa79a691421dd7bce9d1c56e383acb0c
tree493aeea552ba7590b3652614b9caf2a5df11c69c
parent86e706731d2b31d1685ac2fd2f63b7275d3b59bc
parent59ea1aa9a9897abeaf5ed833f88b3959ebeac74e
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Work around memory probing bug in openfirmware.
  sparc32: fix rtrap.S typo
  sparc32: Fix build.