aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-09 08:27:25 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-09 08:27:25 -0700
commite7bc15a9ad07269c48732e9a9874e5938b4700ee (patch)
treedfe010e71720a534a15bb38cd454c7f80db2b1f3 /net
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc (diff)
parent[SPARC64]: Fix memory leak when cpu hotplugging. (diff)
downloadlinux-dev-e7bc15a9ad07269c48732e9a9874e5938b4700ee.tar.xz
linux-dev-e7bc15a9ad07269c48732e9a9874e5938b4700ee.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Fix memory leak when cpu hotplugging. [SPARC64]: Do not assume sun4v chips have load-twin/store-init support. [SPARC64]: Fix hard-coding of cpu type output in /proc/cpuinfo on sun4v. [SPARC]: Centralize find_in_proplist() instead of duplicating N times.
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions