summaryrefslogtreecommitdiffstats
path: root/arch/mips/pci
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2012-07-25 16:37:46 +0200
committerRalf Baechle <ralf@linux-mips.org>2012-07-25 16:37:46 +0200
commit68d8848567ef03eb2c2303173934428d0bf0a531 (patch)
tree70a3be53181e19de031b9b617a72c84c513bb0ca /arch/mips/pci
parent28a33cbc24e4256c143dce96c7d93bf423229f92 (diff)
parent71a1c776d51a12d064d2b824753d259b0f5050e7 (diff)
parent6c2be5cf1d4e70e98d995f9c403b5fbe7b5f2a80 (diff)
parent2f74b770aa6deea65415e198852c832cceedf994 (diff)
parentb59b284101454823c77c9635f3ee8cd4f979fe6e (diff)
parentf9c9affc5799b9243d57b86fefda0dffbce3a32e (diff)
parent6cd3c7e2b1dc1e3cc28ffcef074d0b8182b6e501 (diff)
parent9afd40811538d82164f42dcdabdcf0f7065044a7 (diff)
parent7e6507ad76a212b961d2392d22a9610be9e4e053 (diff)
downloadlinux-68d8848567ef03eb2c2303173934428d0bf0a531.tar.gz
linux-68d8848567ef03eb2c2303173934428d0bf0a531.tar.bz2
linux-68d8848567ef03eb2c2303173934428d0bf0a531.zip
Merge branches 'next/generic', 'next/alchemy', 'next/bcm63xx', 'next/cavium', 'next/jz4740', 'next/lantiq', 'next/loongson1b' and 'next/netlogic' into mips-for-linux-next