diff options
| author | Linus Torvalds | 2012-07-26 16:19:08 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2012-07-26 16:19:08 -0700 |
| commit | a9197f903f72a81393932d452379c8847fade544 (patch) | |
| tree | d5c6acae9e45efb664288be0d4ad99849ac0e20c /drivers/net/ethernet/mellanox/mlx4/main.c | |
| parent | e2aed8dfa50bb061747eeb14e6af099554a03b76 (diff) | |
| parent | 6bb697b6b06041d2d0affc862b17b4b443a107e0 (diff) | |
Merge tag 'remoteproc-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc
Pull remoteproc update from Ohad Ben-Cohen:
- custom binary format support from Sjur Brændeland
- groundwork for recovery and runtime pm support
- some cleanups and API simplifications
Fix up conflicts in drivers/remoteproc/remoteproc_core.c due to clashes
with earlier cleanups by Sjur Brændeland (with part of the cleanups
moved into the new remoteproc_elf_loader.c file).
* tag 'remoteproc-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc:
MAINTAINERS: add remoteproc's git
remoteproc: Support custom firmware handlers
remoteproc: Move Elf related functions to separate file
remoteproc: Add function rproc_get_boot_addr
remoteproc: Pass struct fw to load_segments and find_rsc_table.
remoteproc: adopt the driver core's alloc/add/del/put naming
remoteproc: remove the get_by_name/put API
remoteproc: support non-iommu carveout assignment
remoteproc: simplify unregister/free interfaces
remoteproc: remove the now-redundant kref
remoteproc: maintain a generic child device for each rproc
remoteproc: allocate vrings on demand, free when not needed
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4/main.c')
0 files changed, 0 insertions, 0 deletions