David S. Miller a1744d3bee Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/wireless/p54/p54common.c		2008-10-31 00:17:34 -07: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-10-31 00:17:34 -07: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
cris	Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb	2008-10-23 08:20:34 -07:00
frv
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	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2008-10-30 12:09:44 -07: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	proc: move /proc/stram to m68k-specific code	2008-10-23 14:25:35 +04:00
m68knommu
mips	CHAR: Delete old and now unused M48T35 RTC driver for SGI IP27.	2008-10-30 14:44:35 +00:00
mn10300
parisc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6	2008-10-23 10:22:40 -07:00
powerpc	Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6	2008-10-30 23:50:18 -07:00
s390	[S390] s390: Fix build for !CONFIG_S390_GUEST + CONFIG_VIRTIO_CONSOLE	2008-10-28 11:12:06 +01:00
sh	sh: asm/gpio.h needs linux/kernel.h for might_sleep()/WARN_ON().	2008-10-23 12:37:20 +09:00
sparc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6	2008-10-23 19:19:14 -07:00
sparc64	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-10-31 00:17:34 -07:00
um	net: convert more to %pM	2008-10-27 17:47:26 -07:00
x86	Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus	2008-10-30 18:35:09 -07:00
xtensa	net: convert more to %pM	2008-10-27 17:47:26 -07:00
.gitignore
Kconfig