git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 498c49f 749ebc1)

author	David Woodhouse <David.Woodhouse@intel.com>
	Mon, 13 Oct 2008 16:13:56 +0000 (17:13 +0100)
committer	David Woodhouse <David.Woodhouse@intel.com>
	Mon, 13 Oct 2008 16:13:56 +0000 (17:13 +0100)
commit	b38f4dfb148351e58e41a958b4c4bbffccc5aee4
tree	50c919bef1b459a778b85159d5929de95b6c4a01	tree \| snapshot
parent	498c49f6df6ae3de5133721d3ce2b837565ac417	commit \| diff
parent	749ebc12eb13b95742e9e3306878ddb83da2b46b	commit \| diff

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

include/asm-x86/statfs.h

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/m32r/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/sparc/include/asm/Kbuild	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/media/video/cafe_ccic.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/sdhci-pci.c	diff1 \|	diff2 \|	blob \| history
include/asm-x86/statfs.h	diff1 \|	diff2 \|	blob \| history
include/linux/pci_ids.h	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.