Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Mon, 22 Sep 2008 14:26:10 +0000 (17:26 +0300)
committerTony Lindgren <tony@atomide.com>
Mon, 22 Sep 2008 14:26:10 +0000 (17:26 +0300)
commitab5516a11682bdd8e38bcb6ab52ab36f301d3b4d
treee39242a008080e67eeed00e540f97bad75a47527
parentde1121fdb899f762b9e717f44eaf3fae7c00cd3e
parent72d31053f62c4bc464c2783974926969614a8649
Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

arch/arm/plat-omap/devices.c
Makefile
drivers/media/video/Kconfig