diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-09 15:56:05 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-09 15:56:05 -0400 |
| commit | fdc614e873bc56ed15d8f4e9fa33516cd0915fc2 (patch) | |
| tree | 9e0a4fd586bbb6913094ebac9af2955914371bdc /arch/arm/mach-pxa/magician.c | |
| parent | bdb08cb2d3491d441dd403dfb88d90ba90fb7232 (diff) | |
| parent | c0f7edb3099d538017c52556aab596b857dc92ee (diff) | |
| parent | 9fc697b0b01416edae99dd9c5c49fb69c9282744 (diff) | |
Merge branches 'pxa-misc', 'pxa-pwm' and 'pxa-multi' into pxa