diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-12 22:42:04 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-12 22:42:04 +0200 |
| commit | a9da4f7ed6a702996ac9d1bbaf1a3969a4c092b3 (patch) | |
| tree | c0b8a8185e7473cd96a730c90509f13c96e100af /drivers/pcmcia | |
| parent | Merge branches 'pxa-ezx', 'pxa-magician' and 'pxa-palm' into pxa (diff) | |
| parent | Clocklib: Fix SA1111 clock name mess. (diff) | |
| parent | [ARM] 5107/1: Add maintainer entries for the CompuLab CM-X270/EM-X270 machines (diff) | |
| download | linux-a9da4f7ed6a702996ac9d1bbaf1a3969a4c092b3.tar.xz linux-a9da4f7ed6a702996ac9d1bbaf1a3969a4c092b3.zip | |
Merge branches 'pxa-ian' and 'pxa-xm270' into pxa
Conflicts:
MAINTAINERS