diff options
author | Jens Axboe | 2009-05-22 20:28:35 +0200 |
---|---|---|
committer | Jens Axboe | 2009-05-22 20:28:35 +0200 |
commit | 9bd7de51ee8537094656149eaf45338cadb7d7d4 (patch) | |
tree | a691987319dfcdb07de2bce619746f88d26882c4 /arch/arm/mach-netx/fb.h | |
parent | Merge branch 'master' into for-2.6.31 (diff) | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryu... (diff) | |
download | kernel-qcow2-linux-9bd7de51ee8537094656149eaf45338cadb7d7d4.tar.gz kernel-qcow2-linux-9bd7de51ee8537094656149eaf45338cadb7d7d4.tar.xz kernel-qcow2-linux-9bd7de51ee8537094656149eaf45338cadb7d7d4.zip |
Merge branch 'master' into for-2.6.31
Conflicts:
drivers/ide/ide-io.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'arch/arm/mach-netx/fb.h')
0 files changed, 0 insertions, 0 deletions