Merge branch 'for-tony' of git://gitorious.org/linux-omap-dss2/linux into omap-for-linus

Conflicts:
	arch/arm/mach-omap2/board-3430sdp.c
This commit is contained in:
Tony Lindgren 2011-02-23 12:06:28 -08:00
commit 7cab8713b1
21 changed files with 1185 additions and 146 deletions