Home
last modified time | relevance | path

Searched hist:"7 fecc34e07e02b4d9dab1a1f4bf7fdac0a656b9b" (Results 1 – 7 of 7) sorted by relevance

/linux/arch/arm/mach-pxa/
H A Dreset.cdiff 7fecc34e07e02b4d9dab1a1f4bf7fdac0a656b9b Sat Jul 12 22:43:01 CEST 2008 Russell King <rmk@dyn-67.arm.linux.org.uk> Merge branch 'pxa-tosa' into pxa

Conflicts:

arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/tosa.c
arch/arm/mach-pxa/spitz.c
H A DMakefilediff 7fecc34e07e02b4d9dab1a1f4bf7fdac0a656b9b Sat Jul 12 22:43:01 CEST 2008 Russell King <rmk@dyn-67.arm.linux.org.uk> Merge branch 'pxa-tosa' into pxa

Conflicts:

arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/tosa.c
arch/arm/mach-pxa/spitz.c
H A DKconfigdiff 7fecc34e07e02b4d9dab1a1f4bf7fdac0a656b9b Sat Jul 12 22:43:01 CEST 2008 Russell King <rmk@dyn-67.arm.linux.org.uk> Merge branch 'pxa-tosa' into pxa

Conflicts:

arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/tosa.c
arch/arm/mach-pxa/spitz.c
/linux/include/linux/mfd/
H A Dcore.hdiff 7fecc34e07e02b4d9dab1a1f4bf7fdac0a656b9b Sat Jul 12 22:43:01 CEST 2008 Russell King <rmk@dyn-67.arm.linux.org.uk> Merge branch 'pxa-tosa' into pxa

Conflicts:

arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/tosa.c
arch/arm/mach-pxa/spitz.c
/linux/sound/soc/pxa/
H A DKconfigdiff 7fecc34e07e02b4d9dab1a1f4bf7fdac0a656b9b Sat Jul 12 22:43:01 CEST 2008 Russell King <rmk@dyn-67.arm.linux.org.uk> Merge branch 'pxa-tosa' into pxa

Conflicts:

arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/tosa.c
arch/arm/mach-pxa/spitz.c
/linux/drivers/mfd/
H A Dmfd-core.cdiff 7fecc34e07e02b4d9dab1a1f4bf7fdac0a656b9b Sat Jul 12 22:43:01 CEST 2008 Russell King <rmk@dyn-67.arm.linux.org.uk> Merge branch 'pxa-tosa' into pxa

Conflicts:

arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/tosa.c
arch/arm/mach-pxa/spitz.c
/linux/
H A DMAINTAINERSdiff 7fecc34e07e02b4d9dab1a1f4bf7fdac0a656b9b Sat Jul 12 22:43:01 CEST 2008 Russell King <rmk@dyn-67.arm.linux.org.uk> Merge branch 'pxa-tosa' into pxa

Conflicts:

arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/tosa.c
arch/arm/mach-pxa/spitz.c