]> git.karo-electronics.de Git - mv-sheeva.git/commit - drivers/infiniband/hw/cxgb4/mem.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 7 Nov 2010 16:10:56 +0000 (16:10 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 7 Nov 2010 16:10:56 +0000 (16:10 +0000)
commit725278e0ecdabbbced6f1b05a23473ec9e4cafee
tree6f0843aa39f5a2df292613b9ed0b537be5047301
parentc947f69fff183e5d2a06160d9262b5dab7359e95
parent7350f419724fd9472d3b5cc521538713f9797b62
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion
arch/arm/mach-kirkwood/common.c
arch/arm/mach-kirkwood/d2net_v2-setup.c
arch/arm/mach-kirkwood/netspace_v2-setup.c
arch/arm/mach-kirkwood/netxbig_v2-setup.c
arch/arm/mach-kirkwood/ts41x-setup.c
arch/arm/mach-orion5x/ts78xx-setup.c