Merge branch 'devel'
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 8 Jan 2009 22:01:49 +0000 (22:01 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 8 Jan 2009 22:01:49 +0000 (22:01 +0000)
1  2 
arch/arm/mach-footbridge/common.c
arch/arm/mach-pxa/e750.c

Simple merge
Simple merge