summaryrefslogtreecommitdiff
path: root/include/asm-arm
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-07-07 15:26:41 (GMT)
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-07-07 15:26:41 (GMT)
commit66ee156078697cdc013d46aed3b2fee445c325a1 (patch)
treecdff6539fa339d4bdf11934778dd93f3c3225dad /include/asm-arm
parent946e2ad040000a14b7316fae722e7e65fa09ffe5 (diff)
parente22af66fc85a8b008237970da4d9b6910422536b (diff)
parent4ed47896935573c8423d05bddda3f269d6e6c613 (diff)
downloadlinux-fsl-qoriq-66ee156078697cdc013d46aed3b2fee445c325a1.tar.xz
Merge branches 'ns9x' and 'machtypes' into devel