summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-05-12 16:28:37 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-12 16:28:37 +0200
commit59b1c82500bb5d658891bc8e8a2308b76d58a4de (patch)
tree493aeea552ba7590b3652614b9caf2a5df11c69c /net
parentcris: Fix compile failure due to typo in serial driver (diff)
parentsparc64: Work around memory probing bug in openfirmware. (diff)
downloadlinux-59b1c82500bb5d658891bc8e8a2308b76d58a4de.tar.xz
linux-59b1c82500bb5d658891bc8e8a2308b76d58a4de.zip
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: sparc64: Work around memory probing bug in openfirmware. sparc32: fix rtrap.S typo sparc32: Fix build.
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions