Merge branch 'l2x0-pull-rmk' of git://dev.omapzoom.org/pub/scm/santosh/kernel-omap4...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 28 Oct 2010 13:42:06 +0000 (14:42 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 28 Oct 2010 13:42:06 +0000 (14:42 +0100)
commitbe6786ac738801d39cfd264ec88c352efd029578
tree3652ce6cfbfdb1dbb8cf5a664e5e84c6d3abd260
parentf9cef506815386df4bd7e463b59e0a0984ce0355
parentae6948048c417d429b8a0f85fad13e483f7cc1a3
Merge branch 'l2x0-pull-rmk' of git://dev.omapzoom.org/santosh/kernel-omap4-base into devel-stable
arch/arm/include/asm/hardware/cache-l2x0.h
arch/arm/mach-omap2/omap4-common.c