summaryrefslogtreecommitdiffstats
path: root/arch/parisc/include
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2009-10-02 23:31:04 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-10-02 23:31:04 +0200
commit534d0c92cfc45174fbfeca2f3dd54c3ce332725e (patch)
tree6f944e0878ca6fc71a844a93aabe81c60fe5f693 /arch/parisc/include
parentARM: 5738/1: Correct TCM documentation (diff)
parentiop: downgrade maintenance status (diff)
downloadlinux-534d0c92cfc45174fbfeca2f3dd54c3ce332725e.tar.xz
linux-534d0c92cfc45174fbfeca2f3dd54c3ce332725e.zip
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/xscaleiop
Conflicts: MAINTAINERS
Diffstat (limited to 'arch/parisc/include')
0 files changed, 0 insertions, 0 deletions