Arjan van de Ven 651dab4264 Merge commit 'linus/master' into merge-linus ... Conflicts: arch/x86/kvm/i8254.c		2008-10-17 09:20:26 -07:00
..
configs	[IA64] Remove sn2_defconfig.	2008-08-18 15:33:40 -07:00
dig
hp	dma-mapping: add the device argument to dma_mapping_error()	2008-07-26 12:00:03 -07:00
ia32	Merge branch 'personality' of git://git390.osdl.marist.edu/pub/scm/linux-2.6	2008-10-16 12:32:52 -07:00
include/asm	Merge branch 'kvm-updates/2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm	2008-10-16 15:36:00 -07:00
kernel	Merge branches 'sched/devel', 'sched/cpu-hotplug', 'sched/cpusets' and 'sched/urgent' into sched/core	2008-10-08 11:31:02 +02:00
kvm	Merge commit 'linus/master' into merge-linus	2008-10-17 09:20:26 -07:00
lib
mm	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2008-10-13 17:13:56 +01:00
oprofile
pci	[IA64] pci_acpi_scan_root cleanup	2008-08-18 15:41:21 -07:00
scripts
sn	[IA64] arch/ia64/sn/pci/tioca_provider.c: introduce missing kfree	2008-09-10 10:49:36 -07:00
uv	[IA64] Fix CONFIG_IA64_SGI_UV build error	2008-06-16 09:02:03 -07:00
install.sh
Kconfig	Kconfig: eliminate "def_bool n" constructs	2008-10-16 11:21:31 -07:00
Kconfig.debug
Makefile	Pull pvops into release branch	2008-07-17 10:53:37 -07:00
module.lds