Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Thu, 5 Jun 2008 21:49:16 +0000 (14:49 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 5 Jun 2008 21:49:16 +0000 (14:49 -0700)
commit3bbf8f7b69276626ed9bab406a4a2e59709b27d7
treeadc3d481e630b8ded4050a50862f0be39767f6a6
parent204b13bda11061f987a093ca1b0d1f71b122bdaa
parent53c8ba95402be65d412a806cda3430f0e72cd107
Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'
MAINTAINERS
Makefile
drivers/serial/8250.c