| commit | 3879f5d6f03b66626af014cbb6071ad4d79b1c42 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | Mon Mar 16 22:28:04 2009 +0000 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Mon Mar 16 22:28:04 2009 +0000 |
| tree | 018c183306253f12c1d9da739a78d41be71e1cb3 | |
| parent | 607b067e161185d5c441aa366ff9fccd4fd676cb [diff] | |
| parent | 6e1588cbd88590273300403648aef70e6bdaf5af [diff] |
Merge branch 'imx-fb-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx into devel Conflicts: drivers/video/mx3fb.c