]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'u300' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sun, 14 Jun 2009 10:01:44 +0000 (11:01 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 14 Jun 2009 10:01:44 +0000 (11:01 +0100)
commit872343db06f13cd7da3bc4068cf5efe5c1027845
treec65b81ef9ae5076d2137034accfa2610f45a13de
parentf9bf359a50c0926aecd69025fb6e0c15a6e67a04
parent83985531e8798cad373f3bb2c20b0d2b672834b8
Merge branch 'u300' into devel

Conflicts:
arch/arm/Makefile
Updates:
arch/arm/mach-u300/core.c
arch/arm/mach-u300/timer.c
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mach-u300/core.c
arch/arm/mach-u300/timer.c
arch/arm/mm/mmu.c