diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-23 19:05:10 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-23 19:05:10 +0200 |
| commit | 4b60e5f90dec4ae251386f20464336369e962e9c (patch) | |
| tree | 13ca50e109a23bcc5e1622ca658000cb85668d1e /arch/mips/pci/pci-lantiq.h | |
| parent | ARM: bcmring: convert to use sp804 clockevents (diff) | |
| parent | ARM: 6910/1: MTD: physmap: let set_vpp() pass a platform_device instead of a ... (diff) | |
| parent | ARM: 6871/1: Use asm-generic/sizes.h (diff) | |
| parent | ARM: 6895/1: mach-ux500: fix SMP secondary startup regression (diff) | |
| parent | ARM: plat-stmp: remove plat (diff) | |
| parent | ARM: use ARM_DMA_ZONE_SIZE to adjust the zone sizes (diff) | |
| download | linux-4b60e5f90dec4ae251386f20464336369e962e9c.tar.xz linux-4b60e5f90dec4ae251386f20464336369e962e9c.zip | |
Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate