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)
Merge branches 'master' and 'linus'

Conflicts:

arch/arm/plat-omap/devices.c

1  2 
Makefile
drivers/media/video/Kconfig

diff --cc Makefile
Simple merge
Simple merge