| commit | 5ff7f78a3db462ea4edf1a781a2002d4e8a8a473 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | Tue Oct 07 19:06:52 2008 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Tue Oct 07 19:06:52 2008 +0100 |
| tree | fc0516369f4146595c5dce9bddda23d8691c3f42 | |
| parent | 35437b6192d9a4eb92f095dfd72396b6d2970f0b [diff] | |
| parent | 92b797f6a1347623a41caf02516b70e5fa706a90 [diff] |
Merge branch 'pxa-trizeps' into pxa-machines Conflicts: drivers/pcmcia/Makefile