summaryrefslogtreecommitdiffstats
path: root/include/asm-arm/arch-pxa
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-04-29 22:31:06 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-04-29 22:31:06 +0200
commit92794a5d6359f9e8ed0d43fe0f3c653f748dcc90 (patch)
treeff9e1e49639c657c72d848f891f8f1b44de7a541 /include/asm-arm/arch-pxa
parent[ARM] serial: s3c2410: platform_get_irq() may return signed unnoticed (diff)
parent[ARM] pxa: fix 1c104e0e4f6ab396960c058e95e18bdedcac945b (diff)
parent[ARM] Orion: catch a couple more alternative spellings of PCIe (diff)
downloadlinux-92794a5d6359f9e8ed0d43fe0f3c653f748dcc90.tar.xz
linux-92794a5d6359f9e8ed0d43fe0f3c653f748dcc90.zip
Merge branches 'pxa' and 'orion-fixes1'