diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 18:33:54 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 18:33:54 +0100 |
| commit | 602fd7c36728a04e61a442c9755e7d454501266c (patch) | |
| tree | 6be77464bd07934a40959d68e5d08d75829bdc49 /arch/arm/mach-pxa/idp.c | |
| parent | Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable (diff) | |
| parent | ARM: S3C6410: Correct names of IISv4 data output pin definitions (diff) | |
| download | linux-602fd7c36728a04e61a442c9755e7d454501266c.tar.xz linux-602fd7c36728a04e61a442c9755e7d454501266c.zip | |
Merge branch 'for-rmk' of git://git.fluff.org/bjdooks/linux into devel-stable
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/mach-pxa/idp.c')
0 files changed, 0 insertions, 0 deletions