]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Thu, 11 Dec 2008 01:30:44 +0000 (17:30 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 11 Dec 2008 01:30:44 +0000 (17:30 -0800)
commit5fa89e33d1aebec609a09c0fe8dc733ea19126a1
tree6890bc19ea1bcfd775023b9558e77337a740bbf4
parent694653afe8eb75191734cd4e6477c3182cf880b7
parent8b1fae4e4200388b64dd88065639413cb3f1051c
Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

drivers/mtd/onenand/omap2.c
Makefile
arch/arm/plat-omap/include/mach/omapfb.h
arch/arm/plat-omap/sram.c