diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-08 21:26:05 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-08 21:26:05 +0000 |
| commit | 9b78bdc30138443f14771262f527cfcc5d99fb21 (patch) | |
| tree | 8e764ae4a473da36844609a098855cecebee3893 /arch | |
| parent | ed60453fa8f8fc3d034dfdf10371a99cc6905626 (diff) | |
| parent | 11dff12cae19246ba602e9c4daab0ca358b67522 (diff) | |
| parent | 28257f7fdee0facc3b7f934e82c2485f27120d41 (diff) | |
| parent | b23065313297e750edd57ab6edfd36224826724e (diff) | |
| parent | 4a50bfe365a977f634311504484342fbfffe855c (diff) | |
| parent | 112afc0aa16abbc47633e3487b1ae82feb668590 (diff) | |
| parent | 50005a8deb38e5e6456ebd94e57adb321d4589de (diff) | |
| parent | 329bcc8861d23ed5c083b24cb606390da3ae3d41 (diff) | |
| parent | 7decaa557a20f48aabef35f817ec16ef563567b0 (diff) | |
| parent | 3d09fbcd26851ffb2c40cec411b8e56db02520d1 (diff) | |
| parent | ec2fe3fa80921933a92745651b4f0d9e540a75f6 (diff) | |
| parent | 8a9618f5dfca35edb0d7ab6374ff586e2e9e989b (diff) | |
Merge branches 'ftrace', 'gic', 'io', 'kexec', 'misc', 'mmci', 'mod', 'pgt', 'sa11x0', 'sh', 'smp' and 'versatile' into devel
Conflicts:
arch/arm/common/Makefile