Ingo Molnar cb28a1bbdb Merge branch 'linus' into core/generic-dma-coherent ... Conflicts: arch/x86/Kconfig Signed-off-by: Ingo Molnar <mingo@elte.hu>		2008-07-29 00:07:55 +02:00
..
arch-v10	cris: use the common ascii hex helpers	2008-07-26 12:00:05 -07:00
arch-v32	Merge branch 'linus' into core/generic-dma-coherent	2008-07-29 00:07:55 +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