You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		16 years ago
..
alpha	Merge branch 'v28-range-hrtimers-for-linus-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	17 years ago
arm	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	16 years ago
avr32	Merge branches 'boards' and 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6	17 years ago
blackfin	Blackfin arch: fix a broken define in dma-mapping	16 years ago
cris	[CRIS] Remove links from CRIS build	16 years ago
frv	container freezer: implement freezer cgroup subsystem	17 years ago
h8300	Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb	17 years ago
ia64	[IA64] xen: fix xen_get_eflags.	16 years ago
m32r	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile	17 years ago
m68k	m68k: Fix off-by-one in m68k_setup_user_interrupt()	16 years ago
m68knommu	container freezer: implement freezer cgroup subsystem	17 years ago
mips	MIPS: csrc-r4k: Fix declaration depending on the wrong CONFIG_ symbol.	16 years ago
mn10300	MN10300: Don't do misalignment handling for userspace	16 years ago
parisc	parisc: fix bug in compat_arch_ptrace	16 years ago
powerpc	powerpc: Update desktop/server defconfigs	16 years ago
s390	netdev: introduce dev_get_stats()	16 years ago
sh	serial: sh-sci: Reorder the SCxTDR write after the TDxE clear.	16 years ago
sparc	sparc64: wire up accept4()	16 years ago
sparc64	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	16 years ago
um	net: convert more to %pM	17 years ago
x86	x86: Fix interrupt leak due to migration	16 years ago
xtensa	net: convert more to %pM	17 years ago
.gitignore	…
Kconfig	Change UTF8 chars in Kconfig help text about Oprofile AMD barcelona	17 years ago