]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
projects / linux-2.6-omap-h63xx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2d9aaa7 b934c98)
Merge branch 'omap-pool'
authorTony Lindgren <tony@atomide.com>
Tue, 7 Apr 2009 23:40:35 +0000 (16:40 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 7 Apr 2009 23:40:35 +0000 (16:40 -0700)
Conflicts:
drivers/Makefile
drivers/mmc/host/omap_hsmmc.c


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.