diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-05-21 15:15:10 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-05-21 15:15:10 +0100 |
| commit | ddf90a2ff2c4a9da99acc898a4afeab3e4251fcd (patch) | |
| tree | 97eb0b6e2d4fad9d5a3e58a4762997c6170ae05d /arch/arm/include/asm | |
| parent | dfb85185bda373a70409c70c2632b02fb0f8f449 (diff) | |
| parent | 5693188a6e888603afa9564974145e5e6e2c623c (diff) | |
| parent | 56cb248428ead13a6b423ed3f3cf9e4aa01244b1 (diff) | |
| parent | d098bc7d58ebda22a6554b6c9df1056802d9900f (diff) | |
| parent | 34fd421349ffc6a4280b71276bf7c6d48f92156f (diff) | |
| parent | 90cf2418f5c45192bac1ac57af62f61dbac92886 (diff) | |
| parent | d12379acaf55a395083ca81d753b1af75507556c (diff) | |
Merge branches 'amba', 'devel-stable', 'fixes', 'mach-types', 'mmci', 'pci' and 'versatile' into for-linus