Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Mon, 23 Feb 2009 18:07:09 +0000 (10:07 -0800)
committerTony Lindgren <tony@atomide.com>
Mon, 23 Feb 2009 18:07:09 +0000 (10:07 -0800)
Merge branches 'master' and 'linus'

Conflicts:

arch/arm/mach-omap2/clock.c


Trivial merge