diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-20 14:27:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-20 14:27:00 -0800 |
| commit | e177bb587ea0fade3d9a86f6667da8d89bea3607 (patch) | |
| tree | daebf1786d014cc3182137c76e02381d0aceb245 /arch/arm/include/asm/mach/pci.h | |
| parent | 55529fa5762462beb39f913c5277cb96c7be0858 (diff) | |
| parent | 561839598e61f03c9175183ea066b2b7fa58ce85 (diff) | |
| download | linux-e177bb587ea0fade3d9a86f6667da8d89bea3607.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k update from Geert Uytterhoeven.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Sort out !CONFIG_MMU_SUN3 vs. CONFIG_HAS_DMA
swim: Add missing spinlock init
Diffstat (limited to 'arch/arm/include/asm/mach/pci.h')
0 files changed, 0 insertions, 0 deletions