]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit - drivers/video/omap/sossi.c
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 694653a 8b1fae4)
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
tree6890bc19ea1bcfd775023b9558e77337a740bbf4tree | snapshot
parent694653afe8eb75191734cd4e6477c3182cf880b7commit | diff
parent8b1fae4e4200388b64dd88065639413cb3f1051ccommit | diff
Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

drivers/mtd/onenand/omap2.c
Makefile diff1 | diff2 | blob | history
arch/arm/plat-omap/include/mach/omapfb.h diff1 | diff2 | blob | history
arch/arm/plat-omap/sram.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.