Len Brown a733a5da97 Merge branches 'release' and 'fluff' into release ... Conflicts: drivers/acpi/scan.c include/linux/acpi.h Signed-off-by: Len Brown <len.brown@intel.com>		2008-02-07 03:38:22 -05:00
..
configs	[IA64] update sn2 defconfig to 64kb pages	2007-10-29 11:32:42 -07:00
dig	[PATCH] tty: Remove include of screen_info.h from tty.h	2006-07-10 13:24:16 -07:00
hp	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6	2008-02-05 10:24:52 -08:00
ia32	[IA64] honor notify_die() returning NOTIFY_STOP	2008-02-05 08:26:44 -08:00
kernel	Merge branches 'release' and 'fluff' into release	2008-02-07 03:38:22 -05:00
lib	[IA64] export copy_page() to modules	2007-12-07 16:10:19 -08:00
mm	[IA64] honor notify_die() returning NOTIFY_STOP	2008-02-05 08:26:44 -08:00
oprofile	Combine instrumentation menus in kernel/Kconfig.instrumentation	2007-10-19 11:53:54 -07:00
pci	[IA64] Nail two more simple section mismatch errors	2007-07-25 13:08:41 -07:00
scripts	[IA64] don't assume that unwcheck.py is executable	2007-12-07 14:42:08 -08:00
sn	Remove pointless casts from void pointers	2008-02-06 10:41:01 -08:00
defconfig	[IA64] Update arch/ia64/configs/* s/SLAB/SLUB/	2007-08-13 14:54:34 -07:00
install.sh
Kconfig	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial	2008-02-04 07:58:52 -08:00
Kconfig.debug
Makefile	[IA64] don't assume that unwcheck.py is executable	2007-12-07 14:42:08 -08:00
module.lds