diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 19:08:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 19:08:03 -0700 |
| commit | dc113c1f1d4b47af1b1ca701c5a39e24d296c2ac (patch) | |
| tree | 0bb5ce21bcd41a9443708567edbdca80d9a72397 /fs | |
| parent | 63a93699c6a58795b854ff573542a08367684dae (diff) | |
| parent | 059718d572e8ad388313b863aff717623bb2552f (diff) | |
| download | linux-stable-dc113c1f1d4b47af1b1ca701c5a39e24d296c2ac.tar.gz linux-stable-dc113c1f1d4b47af1b1ca701c5a39e24d296c2ac.tar.bz2 linux-stable-dc113c1f1d4b47af1b1ca701c5a39e24d296c2ac.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k/block: amiflop - Remove superfluous amiga_chip_alloc() cast
m68k/atari: ARAnyM - Add support for network access
m68k/atari: ARAnyM - Add support for console access
m68k/atari: ARAnyM - Add support for block access
m68k/atari: Initial ARAnyM support
m68k: Kconfig - Remove unneeded "default n"
m68k: Makefiles - Change to new flags variables
m68k/amiga: Reclaim Chip RAM for PPC exception handlers
m68k: Allow all kernel traps to be handled via exception fixups
m68k: Use base_trap_init() to initialize vectors
m68k: Add helper function handle_kernel_fault()
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions