Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Wed, 10 Sep 2008 17:27:10 +0000 (10:27 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 10 Sep 2008 17:27:10 +0000 (10:27 -0700)
commit8c026a9a7d66735621b06bfcafb57ab5a4274630
tree5db650812e594332df726f7b499a6e78de8816db
parent2a4625ebb6538f9eef5d524b8e39e5c0c1316f9a
parentadee14b2e1557d0a8559f29681732d05a89dfc35
Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

arch/arm/mach-omap1/mcbsp.c
arch/arm/mach-omap2/mcbsp.c
arch/arm/plat-omap/include/mach/mcbsp.h
arch/arm/plat-omap/mcbsp.c
Makefile
drivers/media/radio/Makefile
drivers/media/video/Makefile
drivers/serial/8250.c