You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Russell King
3f30a09a61
Merge branch 'pxa-all' into devel
Conflicts:
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/corgi.c
arch/arm/mach-pxa/include/mach/hardware.h
arch/arm/mach-pxa/spitz.c
|
17 years ago |
.. |
include/mach
|
Merge branches 'machtypes', 'core', 'ep93xx', 'ks8695', 'netdev' and 'sa1100' into devel
|
17 years ago |
Kconfig
|
[ARM] 5276/1: ep93xx: allow selecting UART for early kernel messages
|
17 years ago |
Makefile
|
[ARM] 4988/1: Add GPIO lib support to the EP93xx
|
17 years ago |
Makefile.boot
|
…
|
|
adssphere.c
|
Merge branches 'machtypes', 'core', 'ep93xx', 'ks8695', 'netdev' and 'sa1100' into devel
|
17 years ago |
clock.c
|
[ARM] Convert asm/io.h to linux/io.h
|
17 years ago |
core.c
|
Merge branch 'pxa-all' into devel
|
17 years ago |
edb9302.c
|
Merge branches 'machtypes', 'core', 'ep93xx', 'ks8695', 'netdev' and 'sa1100' into devel
|
17 years ago |
edb9302a.c
|
Merge branches 'machtypes', 'core', 'ep93xx', 'ks8695', 'netdev' and 'sa1100' into devel
|
17 years ago |
edb9307.c
|
Merge branches 'machtypes', 'core', 'ep93xx', 'ks8695', 'netdev' and 'sa1100' into devel
|
17 years ago |
edb9312.c
|
Merge branches 'machtypes', 'core', 'ep93xx', 'ks8695', 'netdev' and 'sa1100' into devel
|
17 years ago |
edb9315.c
|
Merge branches 'machtypes', 'core', 'ep93xx', 'ks8695', 'netdev' and 'sa1100' into devel
|
17 years ago |
edb9315a.c
|
Merge branches 'machtypes', 'core', 'ep93xx', 'ks8695', 'netdev' and 'sa1100' into devel
|
17 years ago |
gesbc9312.c
|
Merge branches 'machtypes', 'core', 'ep93xx', 'ks8695', 'netdev' and 'sa1100' into devel
|
17 years ago |
gpio.c
|
Merge branches 'machtypes', 'core', 'ep93xx', 'ks8695', 'netdev' and 'sa1100' into devel
|
17 years ago |
micro9.c
|
Merge branches 'machtypes', 'core', 'ep93xx', 'ks8695', 'netdev' and 'sa1100' into devel
|
17 years ago |
ts72xx.c
|
Merge branches 'machtypes', 'core', 'ep93xx', 'ks8695', 'netdev' and 'sa1100' into devel
|
17 years ago |