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)
commit97b5fe8e28d78779e35ac283bacb9eceffd5b4a3
tree61f14f70b1de0ef0e48e9504d083754a82b71dca
parentbe680c716c465a173c1c783185e3d023899742fc
parentbdbb861f75c2bd94480316d3318dff280f4f5ce4
Merge branch 'devel'
arch/arm/mach-footbridge/common.c
arch/arm/mach-pxa/e750.c