Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Apr 2009 14:45:52 +0000 (07:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Apr 2009 14:45:52 +0000 (07:45 -0700)
commitdc0046c7586da5db7561dd8b8e09b40d29ade5fa
tree05ab773b89fec9b2f3fcab67875894d2ea98aee2
parentf8c3301e8336334be62527c5314018f75f58ad4b
parent956d039a2537cf79ca608450d36cc70e0e515482
Merge git://git./linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc: Fix bus type probing for ESP and LE devices.
  sparc32: Update defconfig.
  sparc64: Update defconfig.