]> git.baikalelectronics.ru Git - kernel.git/commit
ARM: Merge next-s3c24xx-dev-rtp
authorBen Dooks <ben-linux@fluff.org>
Thu, 3 Dec 2009 21:33:01 +0000 (21:33 +0000)
committerBen Dooks <ben-linux@fluff.org>
Thu, 3 Dec 2009 21:33:01 +0000 (21:33 +0000)
commitbeeacd9456e8f5d3a8e5d5135d74fcdadbc36865
treef71e3f05420f35f7eaf838d93fb83d665aedcac4
parentd2806940ceddc11710d93c667c455a00ca800a9a
parent5f666559ec6dae154aee192b60ed6e937c3fc533
ARM: Merge next-s3c24xx-dev-rtp

Merge branch 'next-s3c24xx-dev-rtp' into for-rmk

Conflicts:

arch/arm/mach-s3c2440/mach-anubis.c
arch/arm/mach-s3c2410/mach-bast.c
arch/arm/mach-s3c2440/mach-anubis.c
arch/arm/mach-s3c2440/mach-osiris.c
arch/arm/mach-s3c2440/mach-rx3715.c