aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-04-24 10:45:52 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-24 10:45:52 -0400
commitdc0046c7586da5db7561dd8b8e09b40d29ade5fa (patch)
tree05ab773b89fec9b2f3fcab67875894d2ea98aee2 /net/ipv4
parentf8c3301e8336334be62527c5314018f75f58ad4b (diff)
parent956d039a2537cf79ca608450d36cc70e0e515482 (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.
Diffstat (limited to 'net/ipv4')
0 files changed, 0 insertions, 0 deletions