linux/arch
David S. Miller 6ab33d5171 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:

	drivers/net/ixgbe/ixgbe_main.c
	include/net/mac80211.h
	net/phonet/af_phonet.c
2008-11-20 16:44:00 -08:00
..
alpha Merge branch 'v28-range-hrtimers-for-linus-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2008-10-23 10:53:02 -07:00
arm Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-11-18 23:38:23 -08:00
avr32 Merge branches 'boards' and 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6 2008-10-23 15:24:10 +02:00
blackfin Blackfin arch: fix a broken define in dma-mapping 2008-11-18 17:48:22 +08:00
cris [CRIS] Remove links from CRIS build 2008-10-31 23:37:57 +01:00
frv container freezer: implement freezer cgroup subsystem 2008-10-20 08:52:34 -07:00
h8300 Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb 2008-10-23 08:20:34 -07:00
ia64 [IA64] xen: fix xen_get_eflags. 2008-11-20 13:43:01 -08:00
m32r Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile 2008-10-23 10:05:40 -07:00
m68k m68k: Fix off-by-one in m68k_setup_user_interrupt() 2008-11-15 11:36:06 -08:00
m68knommu container freezer: implement freezer cgroup subsystem 2008-10-20 08:52:34 -07:00
mips MIPS: csrc-r4k: Fix declaration depending on the wrong CONFIG_ symbol. 2008-11-20 19:42:33 +00:00
mn10300 MN10300: Don't do misalignment handling for userspace 2008-11-12 10:41:18 -08:00
parisc parisc: fix bug in compat_arch_ptrace 2008-11-20 13:09:17 -08:00
powerpc powerpc: Update desktop/server defconfigs 2008-11-11 19:42:30 +11:00
s390 netdev: introduce dev_get_stats() 2008-11-19 21:40:23 -08:00
sh serial: sh-sci: Reorder the SCxTDR write after the TDxE clear. 2008-11-13 17:46:06 +09:00
sparc sparc64: wire up accept4() 2008-11-19 18:49:57 -08:00
sparc64 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-11-20 16:44:00 -08:00
um net: convert more to %pM 2008-10-27 17:47:26 -07:00
x86 x86: Fix interrupt leak due to migration 2008-11-20 13:17:40 -08:00
xtensa net: convert more to %pM 2008-10-27 17:47:26 -07:00
.gitignore
Kconfig Change UTF8 chars in Kconfig help text about Oprofile AMD barcelona 2008-10-27 19:15:39 +01:00