David S. Miller 7e452baf6b Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/message/fusion/mptlan.c drivers/net/sfc/ethtool.c net/mac80211/debugfs_sta.c		2008-11-11 15:43:02 -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-06 22:43:03 -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
cris	[CRIS] Remove links from CRIS build	2008-10-31 23:37:57 +01: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	[IA64] Reserve elfcorehdr memory in CONFIG_CRASH_DUMP	2008-11-07 09:51:55 -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	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	powerpc: Update desktop/server defconfigs	2008-11-11 19:42:30 +11:00
s390	[S390] s390: Fix build for !CONFIG_S390_GUEST + CONFIG_VIRTIO_CONSOLE	2008-10-28 11:12:06 +01:00
sh	sh: fix sh2a cache entry_mask	2008-10-31 16:29:20 +09:00
sparc	Revert "sparc: correct section of current_pc()"	2008-11-10 12:33:30 -08:00
sparc64	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-11-11 15:43:02 -08:00
um	net: convert more to %pM	2008-10-27 17:47:26 -07:00
x86	Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2008-11-11 10:53:50 -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