diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-25 10:25:48 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-25 10:25:48 -0400 |
| commit | 7670c7010c7b367ca40c3aba02afb36149764a6e (patch) | |
| tree | 9f778e3bc3cb4270a60652c3a9731a5287954965 /fs/9p/vfs_inode.c | |
| parent | 0110bba5e7731524940f9e02ce3d4aae75087f68 (diff) | |
| parent | dbcbf5885aa5a1ce6cbea72acbee100c0482be26 (diff) | |
Merge branch 'for-linus' of git://github.com/gregungerer/m68knommu
* 'for-linus' of git://github.com/gregungerer/m68knommu:
m68k: drop unused Kconfig symbols
m68k: drop unused Kconfig symbols
m68knommu: create common externs for _ram* vars
m68knommu: remove extern declarations of memory_start/memory_end from mm/init
m68knommu: use generic section names in mm/init code
m68knommu: use generic section names in setup code
m68k: merge the mmu and non-mmu traps.c files
m68k: move hardware vector setting from traps.c to its own file
m68k: merge mmu and non-mmu include/asm/entry.h files
m68k: merge the mmu and non-mmu kernel/Makefiles
m68k: merge mmu and non-mmu arch Makefiles
m68k: reorganize Kconfig options to improve mmu/non-mmu selections
m68knommu: fix problems with SPI/GPIO on ColdFire 520x
m68k: fix memcpy to unmatched/unaligned source and dest on 68000
Diffstat (limited to 'fs/9p/vfs_inode.c')
0 files changed, 0 insertions, 0 deletions