]> nv-tegra.nvidia Code Review - linux-2.6.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, 5 Jan 2009 09:50:33 +0000 (10:50 +0100)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Mon, 5 Jan 2009 09:50:33 +0000 (10:50 +0100)
commit353816f43d1fb340ff2d9a911dd5d0799c09f6a5
tree517290fd884d286fe2971137ac89f89e3567785a
parent160bbab3000dafccbe43688e48208cecf4deb879
parentfe0bdec68b77020281dc814805edfe594ae89e0f
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6

Conflicts:
arch/arm/mach-pxa/corgi.c
arch/arm/mach-pxa/poodle.c
arch/arm/mach-pxa/spitz.c
arch/arm/mach-pxa/corgi.c
arch/arm/mach-pxa/poodle.c
arch/arm/mach-pxa/spitz.c
drivers/mtd/maps/ixp2000.c
drivers/mtd/maps/ixp4xx.c
drivers/mtd/onenand/omap2.c
drivers/mtd/ubi/build.c