From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 24 Apr 2009 14:45:52 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.30-rc4~69
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dc0046c7586da5db7561dd8b8e09b40d29ade5fa;p=profile%2Fivi%2Fkernel-x86-ivi.git

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.
---

dc0046c7586da5db7561dd8b8e09b40d29ade5fa