Merge branch 'fixes' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 12 May 2007 15:12:12 +0000 (16:12 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 12 May 2007 15:12:12 +0000 (16:12 +0100)
commit158304ef09a28c7f2dd37d78f536a4e09ba084a1
tree2e6d808fef46d70268e547ccfc5926a865e3d2ea
parent641e79129a56a4c50be1aed0fa713f440b46a440
parent25f4a81ef51b7c279786f5b81fe6d89510f46d99
Merge branch 'fixes' into devel
arch/arm/Kconfig
arch/arm/mach-at91/Makefile
include/asm-arm/arch-at91/hardware.h