aboutsummaryrefslogtreecommitdiff
path: root/include/linux/vmalloc.h
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-03-16 22:28:04 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-03-16 22:28:04 +0000
commit3879f5d6f03b66626af014cbb6071ad4d79b1c42 (patch)
tree018c183306253f12c1d9da739a78d41be71e1cb3 /include/linux/vmalloc.h
parent607b067e161185d5c441aa366ff9fccd4fd676cb (diff)
parent6e1588cbd88590273300403648aef70e6bdaf5af (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
Diffstat (limited to 'include/linux/vmalloc.h')
0 files changed, 0 insertions, 0 deletions