| commit | d4a7dbfdf180a656de3eb9e64614e2b991ffaa53 | [log] [tgz] |
|---|---|---|
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | Mon Aug 29 09:14:30 2011 +0000 |
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | Mon Aug 29 09:14:30 2011 +0000 |
| tree | f7d0d548004751aea77f63e6fd695faf0785bde0 | |
| parent | b5480ed72e4f299c53d1857faaf4f492650ccc43 [diff] | |
| parent | fa514fbc57419505d0e9423dbb8742f2775f882e [diff] |
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