git://ftp.safe.ca / safe / jmp / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 36cd4fb 10fec20)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid Woodhouse <David.Woodhouse@intel.com>
Tue, 12 Aug 2008 10:28:00 +0000 (11:28 +0100)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Tue, 12 Aug 2008 10:28:00 +0000 (11:28 +0100)
commit742c52533b05d8ae83c794bd6811100675b85ce5
treede89a81d88c19504d1dc4f023a4b480c9022b3b5tree | snapshot
parent36cd4fb5d277f34fe9e4db0deac2d4efd7dff735commit | diff
parent10fec20ef5eec1c91913baec1225400f0d02df40commit | diff
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6

Conflicts:

include/asm-arm/arch-omap/onenand.h
arch/arm/plat-omap/include/mach/onenand.h | diff2 | blob | history
drivers/mtd/nand/Kconfig diff1 | diff2 | blob | history
drivers/mtd/nand/Makefile diff1 | diff2 | blob | history
Full containers within linux kernel