diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-28 21:33:51 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-28 21:33:51 +0200 |
commit | 55f08e1baa3ef11c952b626dbc7ef9e3e8332a63 (patch) | |
tree | 4eb5f0bf3fd8d26ead9bd92ed8c5214cecf348ea /drivers/dma/dw_dmac.c | |
parent | Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6 (diff) | |
parent | mfd: Fix build breakage caused by tps65910 gpio directory move (diff) | |
download | linux-55f08e1baa3ef11c952b626dbc7ef9e3e8332a63.tar.xz linux-55f08e1baa3ef11c952b626dbc7ef9e3e8332a63.zip |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
mfd: Fix build breakage caused by tps65910 gpio directory move
mfd: Use mfd cell platform_data for db8500-prcmu cells platform bits
Diffstat (limited to 'drivers/dma/dw_dmac.c')
0 files changed, 0 insertions, 0 deletions