Merge branch 'omap2-upstream' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 19 Apr 2008 16:17:29 +0000 (17:17 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 19 Apr 2008 16:17:29 +0000 (17:17 +0100)
commitadf6d34e460387ee3e8f1e1875d52bff51212c7d
tree88ef100143e6184103a608f82dfd232bf6376eaf
parentd1964dab60ce7c104dd21590e987a8787db18051
parent3760d31f11bfbd0ead9eaeb8573e0602437a9d7c
Merge branch 'omap2-upstream' into devel
MAINTAINERS
arch/arm/Kconfig
arch/arm/kernel/calls.S
drivers/net/Kconfig