SAFE public projects git trees. - safe/jmp/linux-2.6/commit - include/linux/pci_ids.h

git://ftp.safe.ca / safe / jmp / linux-2.6 / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 11c34c7 3ff6a46)

author	Benjamin Herrenschmidt <benh@kernel.crashing.org>
	Wed, 9 Dec 2009 06:14:38 +0000 (17:14 +1100)
committer	Benjamin Herrenschmidt <benh@kernel.crashing.org>
	Wed, 9 Dec 2009 06:14:38 +0000 (17:14 +1100)
commit	bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71
tree	2f6dffd2d3e4dd67355a224de7e7a960335a92fd	tree \| snapshot
parent	11c34c7deaeeebcee342cbc35e1bb2a6711b2431	commit \| diff
parent	3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c	commit \| diff

Merge commit 'origin/master' into next

Conflicts:
include/linux/kvm.h

14 files changed:

Documentation/powerpc/dts-bindings/fsl/mpc5200.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/hvcall.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/exceptions-64s.S	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/irq.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/setup_64.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/time.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/traps.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kvm/powerpc.c	diff1 \|	diff2 \|	blob \| history
drivers/ata/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/ata/Makefile	diff1 \|	diff2 \|	blob \| history
include/linux/kvm.h	diff1 \|	diff2 \|	blob \| history
include/linux/pci_ids.h	diff1 \|	diff2 \|	blob \| history
virt/kvm/kvm_main.c	diff1 \|	diff2 \|	blob \| history

Full containers within linux kernel