aboutsummaryrefslogtreecommitdiff
path: root/arch/parisc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-09-29 08:30:47 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-09-29 08:30:47 -0700
commitdf45eddc60e1ab4c81b61e240271eabb4fb176e8 (patch)
tree7cbaf1a7a191f7b6274afbc071bbc1453f73d668 /arch/parisc
parent929675d58c5b4883050804f2b48de2293803862d (diff)
parent81e4807303c416a0defdce8b23a6204416d33280 (diff)
Merge branch 'linux-m32r' of git://www.linux-m32r.org/git/takata/linux-2.6_dev
* 'linux-m32r' of git://www.linux-m32r.org/git/takata/linux-2.6_dev: m32r/kernel/: cleanups m32r: export __ndelay m32r: export empty_zero_page m32r: don't offer CONFIG_ISA m32r: remove the unused NOHIGHMEM option
Diffstat (limited to 'arch/parisc')
0 files changed, 0 insertions, 0 deletions