| commit | 374da9da22ebaad0524c77905b5e89ae4619bef3 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Sun Mar 25 23:54:16 2012 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Sun Mar 25 23:54:16 2012 +0100 |
| tree | 78f8ebbbc2e730b8e510e3a68b5b73755196fb68 | |
| parent | fbae0f8912dc12b284433c05417ea76311205bbf [diff] | |
| parent | 81e6ca3eb74d6bdbab181dd2db378f49f76f0d97 [diff] |
Merge branch 'sa1111' into sa11x0 Conflicts: arch/arm/common/sa1111.c arch/arm/mach-sa1100/neponset.c Fixed: arch/arm/mach-sa1100/assabet.c for the neponset changes