Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of ↵ | David Woodhouse | 2008-08-12 | 1 | -1/+5 |
| | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 Conflicts: include/asm-arm/arch-omap/onenand.h | ||||
* | [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach | Russell King | 2008-08-07 | 1 | -0/+21 |
This just leaves include/asm-arm/plat-* to deal with. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> |