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

…

arm

…

avr32

…

blackfin

…

cris

…

frv

…

h8300

…

ia64

…

m32r

…

m68k

…

m68knommu

…

mips

…

mn10300

…

parisc

…

powerpc

powerpc: Update desktop/server defconfigs

2008-11-11 19:42:30 +11:00

s390

…

sh

…

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

…

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

…

.gitignore

…

Kconfig

…