David Woodhouse e758936e02 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: include/asm-x86/statfs.h		2008-10-13 17:13:56 +01:00
..
arch-v10	Remove asm/a.out.h files for all architectures without a.out support.	2008-09-06 19:30:24 +01:00
arch-v32	kernel/cpu.c: create a CPU_STARTING cpu_chain notifier	2008-09-08 19:25:24 +02:00
kernel	cris: use simple_read_from_buffer()	2008-07-24 10:47:24 -07:00
mm	cris: use generic show_mem()	2008-07-26 12:00:11 -07:00
artpec_3_defconfig	CRIS: Remove CONFIG_NO_IOMEM from ARTPEC-3 default config.	2008-02-08 11:06:37 +01:00
defconfig	CRIS: Remove CONFIG_NO_IOMEM from default configs.	2008-02-08 11:06:36 +01:00
etraxfs_defconfig	CRIS: Remove CONFIG_NO_IOMEM from default configs.	2008-02-08 11:06:36 +01:00
Kconfig	ide: introduce HAVE_IDE	2008-02-09 10:46:40 +01:00
Kconfig.debug
Makefile	CRIS: Update main Kbuild makefile.	2008-02-08 11:06:25 +01:00