diff options
| author | Olof Johansson <olof@lixom.net> | 2012-03-27 16:00:49 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-27 16:00:49 -0700 |
| commit | 83b5938ce77bbbd9a04e5270ef2b3f17921bf0d4 (patch) | |
| tree | fa67d6dc9642d0e37ba164d667d9eea718027668 /net/netlabel/netlabel_mgmt.h | |
| parent | fdd8397497b389090a008f32bc67ba4f067bca1b (diff) | |
| parent | 23019a733bb83c8499f192fb428b7e6e81c95a34 (diff) | |
Merge branch 'io-cleanup-for-3.4' of git://sources.calxeda.com/kernel/linux into next/cleanup2
* 'io-cleanup-for-3.4' of git://sources.calxeda.com/kernel/linux:
ARM: pxa: use common IOMEM definition
ARM: dma-mapping: convert ARCH_HAS_DMA_SET_COHERENT_MASK to kconfig symbol
Diffstat (limited to 'net/netlabel/netlabel_mgmt.h')
0 files changed, 0 insertions, 0 deletions