linux-sg2042/arch/alpha
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
..
boot Disintegrate asm/system.h for Alpha 2012-03-28 18:11:12 +01:00
include Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-11-10 18:32:51 -05:00
kernel Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2012-11-18 09:13:48 -10:00
lib alpha: Use new generic strncpy_from_user() and strnlen_user() 2012-08-19 08:41:18 -07:00
math-emu alpha: change to new Makefile flag variables 2011-01-17 05:42:13 +01:00
mm alpha/mm/fault.c: Port OOM changes to do_page_fault 2012-08-19 08:41:19 -07:00
oprofile alpha: Fix fall-out from disintegrating asm/system.h 2012-08-19 08:41:19 -07:00
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.debug alpha/parisc: remove config variable DEBUG_RWLOCK 2008-02-06 10:41:03 -08:00
Makefile alpha: link failure fix 2008-06-20 16:46:10 -07:00
defconfig defconfig reduction 2010-08-14 22:26:53 +02:00