Merge branch 'fixes' into for-linus

author Russell King <[email protected]>

Wed, 15 Oct 2008 22:16:07 +0000 (23:16 +0100)

committer Russell King <[email protected]>

Wed, 15 Oct 2008 22:16:07 +0000 (23:16 +0100)
author Russell King <[email protected]>
Wed, 15 Oct 2008 22:16:07 +0000 (23:16 +0100)
committer Russell King <[email protected]>
Wed, 15 Oct 2008 22:16:07 +0000 (23:16 +0100)
diff --cc arch/arm/plat-omap/devices.c
Simple merge
diff --cc drivers/serial/8250.c
Simple merge
author	Russell King <[email protected]>
	Wed, 15 Oct 2008 22:16:07 +0000 (23:16 +0100)
committer	Russell King <[email protected]>
	Wed, 15 Oct 2008 22:16:07 +0000 (23:16 +0100)
		1	2
arch/arm/plat-omap/devices.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/serial/8250.c	patch \|	diff1 \|	diff2 \|	blob \| history