]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
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)
commit2502991560dc8244dbe10e48473d85722c1e2ec1
tree63b1f3be2ed56ff06f1e8db709e4ce85d69c3add
parent7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4
parenta9ff8f6462635c8d9f8d64b7b10ddcea8404d77b
Merge branch 'fixes' into for-linus

Conflicts:

arch/arm/mach-versatile/core.c
arch/arm/plat-omap/devices.c
drivers/serial/8250.c