summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-09-27 08:32:01 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-27 08:32:01 -0700
commitba21fe71725f94792330ebc3034ef2b35a36276f (patch)
tree7e61050452b3a3fa6e17a8ae6147d0e4ecc611ca /drivers/net
parent1e2af92e089d4c845248844a3e7ee06ce889af46 (diff)
parent715a0ecc29c850d2b2f76e1803d3f22cd5a0ac0d (diff)
downloadlinux-3.10-ba21fe71725f94792330ebc3034ef2b35a36276f.tar.gz
linux-3.10-ba21fe71725f94792330ebc3034ef2b35a36276f.tar.bz2
linux-3.10-ba21fe71725f94792330ebc3034ef2b35a36276f.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Kill bogus check from bootmem_init(). [SPARC64]: Update defconfig.
Diffstat (limited to 'drivers/net')
0 files changed, 0 insertions, 0 deletions