]> git.baikalelectronics.ru Git - kernel.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)
commit486de6afc52cb1f621d39a5092d2f26360f5936c
tree517290fd884d286fe2971137ac89f89e3567785a
parent99228a65ad0431c0390e1900b78a0f51bed08552
parent16fa43f25a4ae5280c4dc48b6ca5a2ee6f7735e6
Merge branch 'master' of git://git.kernel.org/pub/scm/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