James Bottomley 00dd7b7d26 Merge ../linux-2.6 ... Conflicts: arch/ia64/hp/sim/simscsi.c Stylistic differences in two separate fixes for buffer->request_buffer problem. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>		2006-08-06 12:42:33 -05:00
..
configs	[PATCH] sgiioc4: Always share IRQ	2006-07-31 13:28:40 -07:00
dig	[PATCH] tty: Remove include of screen_info.h from tty.h	2006-07-10 13:24:16 -07:00
hp	[IA64] Fix breakage in simscsi.c	2006-07-31 11:49:26 -07:00
ia32	[PATCH] audit syscall classes	2006-07-01 07:44:10 -04:00
kernel	[IA64] make uncached allocator more node aware	2006-08-04 10:27:27 -07:00
lib	[PATCH] Fix RAID5 + IA64 compile	2006-08-03 10:04:27 -07:00
mm	[IA64] fix show_mem for VIRTUAL_MEM_MAP+FLATMEM	2006-08-03 10:13:23 -07:00
oprofile	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
pci	[PATCH] make valid_mmap_phys_addr_range() take a pfn	2006-07-10 13:24:25 -07:00
scripts	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
sn	[IA64] sparse cleanups	2006-08-02 16:03:44 -07:00
defconfig	[PATCH] sgiioc4: Always share IRQ	2006-07-31 13:28:40 -07:00
install.sh	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
Kconfig	[PATCH] zoned vm counters: basic ZVC (zoned vm counter) implementation	2006-06-30 11:25:34 -07:00
Kconfig.debug	[PATCH] Move Kprobes and Oprofile to "Instrumentation Support" menu	2005-11-07 07:53:35 -08:00
Makefile	[IA64] add vmlinuz target	2006-06-21 14:31:07 -07:00
module.lds	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00