aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/hw/cxgb3
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-08-02 11:52:39 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-08-02 11:52:39 -0700
commitfc6bdb59a501740b28ed3b616641a22c8dc5dd31 (patch)
tree00ddba349c7e96b03af0913da1a74eae8a94a2db /drivers/infiniband/hw/cxgb3
parentMerge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc (diff)
parentx86: OLPC: move s/r-related EC cmds to EC driver (diff)
downloadlinux-dev-fc6bdb59a501740b28ed3b616641a22c8dc5dd31.tar.xz
linux-dev-fc6bdb59a501740b28ed3b616641a22c8dc5dd31.zip
Merge branch 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpc
Pull OLPC platform updates from Andres Salomon: "These move the OLPC Embedded Controller driver out of arch/x86/platform and into drivers/platform/olpc. OLPC machines are now ARM-based (which means lots of x86 and ARM changes), but are typically pretty self-contained.. so it makes more sense to go through a separate OLPC tree after getting the appropriate review/ACKs." * 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpc: x86: OLPC: move s/r-related EC cmds to EC driver Platform: OLPC: move global variables into priv struct Platform: OLPC: move debugfs support from x86 EC driver x86: OLPC: switch over to using new EC driver on x86 Platform: OLPC: add a suspended flag to the EC driver Platform: OLPC: turn EC driver into a platform_driver Platform: OLPC: allow EC cmd to be overridden, and create a workqueue to call it drivers: OLPC: update various drivers to include olpc-ec.h Platform: OLPC: add a stub to drivers/platform/ for the OLPC EC driver
Diffstat (limited to 'drivers/infiniband/hw/cxgb3')
0 files changed, 0 insertions, 0 deletions