Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x into fbdev-next

Conflicts:
	drivers/video/atmel_lcdfb.c
This commit is contained in:
Florian Tobias Schandinat 2011-08-29 09:14:30 +00:00
commit d4a7dbfdf1
28 changed files with 1039 additions and 303 deletions