commit | dc0046c7586da5db7561dd8b8e09b40d29ade5fa | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Apr 24 07:45:52 2009 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Apr 24 07:45:52 2009 -0700 |
tree | 05ab773b89fec9b2f3fcab67875894d2ea98aee2 | |
parent | f8c3301e8336334be62527c5314018f75f58ad4b [diff] | |
parent | 956d039a2537cf79ca608450d36cc70e0e515482 [diff] |
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: sparc: Fix bus type probing for ESP and LE devices. sparc32: Update defconfig. sparc64: Update defconfig.