summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-31 06:54:16 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-31 06:54:16 +0200
commit8e268f333012c62fc6a5a10e1e2a19c1c389853e (patch)
treecaa132b137e1d65c7cf42a37ac23bfad41c3d6e1 /net
parentMerge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff)
parentsh64: Kill off virt_to_bus()/bus_to_virt(). (diff)
downloadlinux-8e268f333012c62fc6a5a10e1e2a19c1c389853e.tar.xz
linux-8e268f333012c62fc6a5a10e1e2a19c1c389853e.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6: sh64: Kill off virt_to_bus()/bus_to_virt(). sh64: Fix irq_intc build failure. sh64: Fix fs.h removal from mm.h regressions.
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions