diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-05 18:08:10 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-05 18:08:10 +0000 |
| commit | 31edf274f9aff1ccd39934a0b2fce38f4405c656 (patch) | |
| tree | fdc7bc445307ccb9648ca1a71375947c8ed59722 /drivers/pcmcia/sa1100_generic.c | |
| parent | 3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5 (diff) | |
| parent | ed60453fa8f8fc3d034dfdf10371a99cc6905626 (diff) | |
| parent | ac61d143ffe2a6db4d4bcf47c21a5159d6a1b644 (diff) | |
| parent | 28257f7fdee0facc3b7f934e82c2485f27120d41 (diff) | |
| parent | b23065313297e750edd57ab6edfd36224826724e (diff) | |
| parent | 50005a8deb38e5e6456ebd94e57adb321d4589de (diff) | |
| parent | cf562b4a550b3cd9d602a05bc27aaaaa376947b4 (diff) | |
| parent | 3d09fbcd26851ffb2c40cec411b8e56db02520d1 (diff) | |
| parent | 8a9618f5dfca35edb0d7ab6374ff586e2e9e989b (diff) | |
Merge branches 'ftrace', 'gic', 'io', 'kexec', 'mod', 'sa11x0', 'sh' and 'versatile' into devel