]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge branch 'fixes' into for-linus
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Wed, 15 Oct 2008 22:16:07 +0000 (23:16 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 15 Oct 2008 22:16:07 +0000 (23:16 +0100)
Conflicts:

arch/arm/mach-versatile/core.c

1  2 
arch/arm/plat-omap/devices.c
drivers/serial/8250.c

Simple merge
Simple merge