Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux...
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Fri, 29 May 2009 19:03:43 +0000 (20:03 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 29 May 2009 19:03:43 +0000 (20:03 +0100)
commit949abd84cd54ff864efca9df822d1e02a56694ec
tree0c0e7696a51e2989f11a37478ff26368cab0e227
parentb0958aed1ea39825439a7848544bfb2e267273b4
parentcd07ecc828486e5887113c7dc4d9f9022145811b
Merge branch 'for-next' of git://git./linux/kernel/git/tmlind/linux-omap-2.6 into devel

Conflicts:
arch/arm/Makefile
arch/arm/Makefile
arch/arm/mach-omap2/Makefile
arch/arm/plat-omap/Kconfig