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


Trivial merge