David S. Miller 24bc518a68 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/wireless/iwlwifi/pcie/tx.c Minor iwlwifi conflict in TX queue disabling between 'net', which removed a bogus warning, and 'net-next' which added some status register poking code. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-11-25 12:49:17 -05:00
..
amiga	m68k/amiga: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR	2012-08-18 15:15:57 +02:00
apollo
atari
bvme6000
configs	netfilter: remove xt_NOTRACK	2012-09-03 13:36:40 +02:00
emu
fpsp040
hp300
ifpsp060
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-11-25 12:49:17 -05:00
kernel	m68k: Wire up kcmp	2012-10-19 17:49:37 +02:00
lib
mac
math-emu
mm	readahead: fault retry breaks mmap file read random detection	2012-10-09 16:22:47 +09:00
mvme16x
mvme147
platform	m68knommu: clean up ColdFire 54xx General Timer definitions	2012-09-27 23:34:03 +10:00
q40	m68k/q40: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR	2012-08-18 15:15:58 +02:00
sun3
sun3x
tools/amiga
install.sh
Kconfig	Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux	2012-10-14 13:39:34 -07:00
Kconfig.bus
Kconfig.cpu	m68k: select CONFIG_GENERIC_ATOMIC64 for all m68k CPU types	2012-08-17 10:04:24 +10:00
Kconfig.debug
Kconfig.devices
Kconfig.machine
Makefile