]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid Woodhouse <David.Woodhouse@intel.com>
Mon, 13 Oct 2008 16:13:56 +0000 (17:13 +0100)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Mon, 13 Oct 2008 16:13:56 +0000 (17:13 +0100)
commite758936e02700ff88a0b08b722a3847b95283ef2
tree50c919bef1b459a778b85159d5929de95b6c4a01
parent239cfbde1f5843c4a24199f117d5f67f637d72d5
parent4480f15b3306f43bbb0310d461142b4e897ca45b
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
arch/m32r/Kconfig
arch/mips/kernel/process.c
arch/sparc/include/asm/Kbuild
arch/x86/Kconfig
drivers/media/video/cafe_ccic.c
drivers/mmc/host/sdhci-pci.c
include/asm-x86/statfs.h
include/linux/pci_ids.h