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 /drivers/pcmcia/sa1111_generic.c | |
| parent | 79c410db6680e8393314003739233b1df0a338fe (diff) | |
| parent | 14d1012db8462bbb7139ac4622f92e541d3019d1 (diff) | |
| parent | d4b19c42ca558273ab99a1093621f267d9d073fc (diff) | |
Merge branches 'pxa-ezx', 'pxa-magician' and 'pxa-palm' into pxa