diff options
| author |   Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-10 19:50:38 +0100 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-10 19:50:38 +0100 |
| commit | 67f5cd0f6ad86f8faacd0c00ffd0d38f228bad8e (patch) | |
| tree | 47d9b7bbeb6b28f85fe107928a6f59cdda891fa0 /scripts/patch-kernel | |
| parent | [ARM] 5169/1: Defconfig for the EZX machines (diff) | |
| parent | [ARM] 5138/1: magician: set pwm-backlight .id = -1 (diff) | |
| parent | [ARM] 5155/1: PalmTX battery monitor (diff) | |
Merge branches 'pxa-ezx', 'pxa-magician' and 'pxa-palm' into pxa