David S. Miller efd0bf97de Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The forcedeth changes had a conflict with the conversion over to atomic u64 statistics in net-next. The libertas cfg.c code had a conflict with the bss reference counting fix by John Linville in net-next. Conflicts: drivers/net/ethernet/nvidia/forcedeth.c drivers/net/wireless/libertas/cfg.c		2011-11-21 13:50:33 -05:00
..
alpha	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2011-11-17 13:11:43 -05:00
arm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-11-21 13:50:33 -05:00
avr32	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2011-11-17 13:11:43 -05:00
blackfin	blackfin: Fixup export.h includes	2011-11-14 17:15:23 +08:00
cris	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-11-21 13:50:33 -05:00
frv	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2011-11-17 13:11:43 -05:00
h8300	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2011-11-17 13:11:43 -05:00
hexagon	Hexagon: Add basic stacktrace functionality for Hexagon architecture.	2011-11-01 07:34:21 -07:00
ia64	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2011-11-17 13:11:43 -05:00
m32r	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2011-11-17 13:11:43 -05:00
m68k	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-11-21 13:50:33 -05:00
microblaze	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
mips	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-11-21 13:50:33 -05:00
mn10300	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2011-11-17 13:11:43 -05:00
openrisc	Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2011-11-06 18:54:53 -08:00
parisc	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2011-11-17 13:11:43 -05:00
powerpc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-11-21 13:50:33 -05:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-11-21 13:50:33 -05:00
score	score: drop unused Kconfig symbols	2011-10-31 23:39:51 +01:00
sh	Merge branches 'sh/pm-runtime' and 'common/clkfwk' into sh-fixes-for-linus	2011-11-11 16:16:25 +09:00
sparc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-11-21 13:50:33 -05:00
tile	Merge branch 'for-linus' of git://github.com/cmetcalf-tilera/linux-tile	2011-11-04 12:33:34 -07:00
um	Merge branch 'for-linus' of git://github.com/richardweinberger/linux	2011-11-02 09:45:39 -07:00
unicore32	unicore32, exec: remove redundant set_fs(USER_DS)	2011-11-16 10:50:09 +08:00
x86	Merge branch 'kvm-updates/3.2' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2011-11-20 14:57:43 -08:00
xtensa	net: add wireless TX status socket option	2011-11-09 16:01:02 -05:00
.gitignore
Kconfig