linux-bl808/arch/m68k
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
emu
fpsp040
hp300 m68k/irq: Remove obsolete IRQ_FLG_* users 2011-11-08 22:35:48 +01:00
ifpsp060
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
mac m68k/mac: Remove mac_irq_{en,dis}able() wrappers 2011-11-08 22:35:52 +01:00
math-emu
mm
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
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
tools/amiga
install.sh
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
Kconfig.debug
Kconfig.devices m68k: Revive lost ARAnyM config options 2011-11-08 22:35:46 +01:00
Kconfig.machine
Makefile