tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge master.kernel.org:/home/rmk/linux-2.6-arm

Linus Torvalds cd0cca7b 6d9885a8

+1 -1
unified split
+1 -1
include/asm-arm/arch-iop3xx/timex.h
··· 4 4 * IOP3xx architecture timex specifications 5 5 */ 6 6 #include <linux/config.h> 7 - 7 + #include <asm/hardware.h> 8 8 9 9 #if defined(CONFIG_ARCH_IQ80321) || defined(CONFIG_ARCH_IQ31244) 10 10