]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
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)
commitf750b2eff6b75bbbbe0653c86f7bcb68d71f3df9
treea4f18a4b9e735dac5ecbd226bb33392ccb8979a7
parent2d9aaa76288b9a4d6aca5067154ceb09122aacd8
parentb934c987ee1764eb09b8843a3ee00eabc24bd52c
Merge branch 'omap-pool'

Conflicts:
drivers/Makefile
drivers/mmc/host/omap_hsmmc.c