diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-31 06:54:16 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-31 06:54:16 +0200 |
commit | 8e268f333012c62fc6a5a10e1e2a19c1c389853e (patch) | |
tree | caa132b137e1d65c7cf42a37ac23bfad41c3d6e1 /init | |
parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff) | |
parent | sh64: Kill off virt_to_bus()/bus_to_virt(). (diff) | |
download | linux-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 'init')
0 files changed, 0 insertions, 0 deletions