Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Thu, 17 Apr 2008 21:05:37 +0000 (14:05 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 17 Apr 2008 21:05:37 +0000 (14:05 -0700)
commite015fc7dba8f5002daa0982eb81d33cc72e68e95
treee1db88471fbab2b36276c60d86075aa6fa41a8b7
parent9d0cbf9442c08a413bafbddb3e0f2cc5a3522bf8
parent4b119e21d0c66c22e8ca03df05d9de623d0eb50f
Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

drivers/mmc/host/omap.c
MAINTAINERS
Makefile
drivers/mmc/host/omap.c
drivers/net/smc91x.c