]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit - arch/arm/mach-omap2/board-n800-flash.c
Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Wed, 12 Nov 2008 19:16:41 +0000 (11:16 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 12 Nov 2008 19:16:41 +0000 (11:16 -0800)
commitd33dcd3247f9700d7634ac44485a656b002c770b
treecc1171884052927dbba4c0c4fb33b806f12b934e
parent1fc9a418d53b723746e3de308d1ac97118411b76
parentf7160c7573615ec82c691e294cf80d920b5d588d
Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

drivers/mtd/onenand/omap2.c
Makefile
arch/arm/mm/mmu.c
drivers/net/smc91x.c
drivers/watchdog/Kconfig