diff options
| author |   Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-07 19:06:52 +0100 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-07 19:06:52 +0100 |
| commit | 5ff7f78a3db462ea4edf1a781a2002d4e8a8a473 (patch) | |
| tree | fc0516369f4146595c5dce9bddda23d8691c3f42 /scripts | |
| parent | Merge branches 'metronomefb', 'pxa-cm2xx', 'pxa-gumstix', 'pxa-misc', 'pxa-mitac', 'pxa-mp900', 'pxa-zylonite' and 'pxa-zaurus' into pxa-machines (diff) | |
| parent | [ARM] pxa: trizeps4: remove unused variable (diff) | |
Merge branch 'pxa-trizeps' into pxa-machines
Conflicts:
drivers/pcmcia/Makefile
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions