leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
fe685b8046
linux/arch/m68k
History
David S. Miller efd0bf97de Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
The forcedeth changes had a conflict with the conversion over
to atomic u64 statistics in net-next.

The libertas cfg.c code had a conflict with the bss reference
counting fix by John Linville in net-next.

Conflicts:
	drivers/net/ethernet/nvidia/forcedeth.c
	drivers/net/wireless/libertas/cfg.c
2011-11-21 13:50:33 -05:00
..
amiga m68k/irq: Remove obsolete m68k irq framework 2011-11-08 22:35:52 +01:00
apollo m68k/irq: Remove obsolete support for user vector interrupt fixups 2011-11-08 22:35:52 +01:00
atari m68k/irq: Remove obsolete support for user vector interrupt fixups 2011-11-08 22:35:52 +01:00
bvme6000 m68k/irq: Remove obsolete support for user vector interrupt fixups 2011-11-08 22:35:52 +01:00
configs m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
emu block: remove support for bio remapping from ->make_request 2011-09-12 12:12:01 +02:00
fpsp040 Fix common misspellings 2011-03-31 11:26:23 -03:00
hp300 m68k/irq: Remove obsolete IRQ_FLG_* users 2011-11-08 22:35:48 +01:00
ifpsp060 Fix common misspellings 2011-03-31 11:26:23 -03:00
include/asm Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2011-11-21 13:50:33 -05:00
kernel m68k/irq: Remove obsolete support for user vector interrupt fixups 2011-11-08 22:35:52 +01:00
lib m68k: fix memcpy to unmatched/unaligned source and dest on 68000 2011-10-18 14:22:24 +10:00
mac m68k/mac: Remove mac_irq_{en,dis}able() wrappers 2011-11-08 22:35:52 +01:00
math-emu m68k/math-emu: Remove unnecessary code 2011-07-30 21:21:40 +02:00
mm m68knommu: create common externs for _ram* vars 2011-10-18 14:22:26 +10:00
mvme16x m68k/irq: Remove obsolete support for user vector interrupt fixups 2011-11-08 22:35:52 +01:00
mvme147 m68k/irq: Remove obsolete support for user vector interrupt fixups 2011-11-08 22:35:52 +01:00
platform m68k: merge mmu and non-mmu include/asm/entry.h files 2011-10-18 14:22:25 +10:00
q40 m68k/irq: Remove obsolete m68k irq framework 2011-11-08 22:35:52 +01:00
sun3 m68k/irq: Remove obsolete support for user vector interrupt fixups 2011-11-08 22:35:52 +01:00
sun3x include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
tools/amiga
install.sh kbuild: use INSTALLKERNEL to select customized installkernel script 2009-09-20 12:18:14 +02:00
Kconfig m68k/irq: Remove obsolete m68k irq framework 2011-11-08 22:35:52 +01:00
Kconfig.bus m68k: Revive lost DIO bus config option 2011-11-08 22:35:46 +01:00
Kconfig.cpu m68k: reorganize Kconfig options to improve mmu/non-mmu selections 2011-10-18 14:22:25 +10:00
Kconfig.debug m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
Kconfig.devices m68k: Revive lost ARAnyM config options 2011-11-08 22:35:46 +01:00
Kconfig.machine m68k: drop unused Kconfig symbols 2011-10-21 14:56:43 +10:00
Makefile m68k: merge mmu and non-mmu arch Makefiles 2011-10-18 14:22:25 +10:00