David S. Miller abb434cb05 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/bluetooth/l2cap_core.c Just two overlapping changes, one added an initialization of a local variable, and another change added a new local variable. Signed-off-by: David S. Miller <davem@davemloft.net>		2011-12-23 17:13:56 -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-12-23 17:13:56 -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
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-12-23 17:13:56 -05:00
microblaze	microblaze: bury asm/namei.h	2011-11-21 16:48:28 -05:00
mips	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-12-06 21:10:05 -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
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-12-02 13:49:21 -05:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-12-23 17:13:56 -05:00
score
sh	sh: fix build warning in board-sh7757lcr	2011-11-18 16:45:50 +09:00
sparc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-12-23 17:13:56 -05:00
tile	arch/tile: use new generic {enable,disable}_percpu_irq() routines	2011-12-03 15:31:49 -05:00
um
unicore32	unicore32, exec: remove redundant set_fs(USER_DS)	2011-11-16 10:50:09 +08:00
x86	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-12-21 18:29:26 -08:00
xtensa	net: add wireless TX status socket option	2011-11-09 16:01:02 -05:00
.gitignore
Kconfig