1
linux/arch
David S. Miller 8decf86879 Merge branch 'master' of github.com:davem330/net
Conflicts:
	MAINTAINERS
	drivers/net/Kconfig
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
	drivers/net/ethernet/broadcom/tg3.c
	drivers/net/wireless/iwlwifi/iwl-pci.c
	drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/wl12xx/main.c
2011-09-22 03:23:13 -04:00
..
alpha alpha, gpio: GENERIC_GPIO default must be n 2011-09-14 18:09:37 -07:00
arm mach-integrator: fix VGA base regression 2011-09-20 22:58:41 +02:00
avr32 All Arch: remove linkage for sys_nfsservctl system call 2011-08-26 15:09:58 -07:00
blackfin All Arch: remove linkage for sys_nfsservctl system call 2011-08-26 15:09:58 -07:00
cris Merge branch 'master' of github.com:davem330/net 2011-09-22 03:23:13 -04:00
frv All Arch: remove linkage for sys_nfsservctl system call 2011-08-26 15:09:58 -07:00
h8300 All Arch: remove linkage for sys_nfsservctl system call 2011-08-26 15:09:58 -07:00
ia64 Merge branch 'master' of github.com:davem330/net 2011-09-22 03:23:13 -04:00
m32r All Arch: remove linkage for sys_nfsservctl system call 2011-08-26 15:09:58 -07:00
m68k All Arch: remove linkage for sys_nfsservctl system call 2011-08-26 15:09:58 -07:00
microblaze All Arch: remove linkage for sys_nfsservctl system call 2011-08-26 15:09:58 -07:00
mips Merge branch 'master' of github.com:davem330/net 2011-09-22 03:23:13 -04:00
mn10300 All Arch: remove linkage for sys_nfsservctl system call 2011-08-26 15:09:58 -07:00
openrisc Add missing DMA ops 2011-09-11 09:50:39 +02:00
parisc remove remaining references to nfsservctl 2011-08-29 16:31:59 -07:00
powerpc Merge branch 'master' of github.com:davem330/net 2011-09-22 03:23:13 -04:00
s390 Merge branch 'master' of github.com:davem330/net 2011-09-22 03:23:13 -04:00
score
sh Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x 2011-08-29 13:34:48 -07:00
sparc sparc64: Only Panther cheetah+ chips have POPC. 2011-08-29 21:14:29 -07:00
tile Merge branch 'apei-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 2011-08-03 21:53:27 -10:00
um Merge branch 'master' of github.com:davem330/net 2011-09-22 03:23:13 -04:00
unicore32 Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 2011-07-29 23:35:05 -07:00
x86 Merge branch 'stable/bug.fixes' of git://oss.oracle.com/git/kwilk/xen 2011-09-16 11:28:11 -07:00
xtensa Merge branch 'master' of github.com:davem330/net 2011-09-22 03:23:13 -04:00
.gitignore
Kconfig Add Kconfig option ARCH_HAVE_NMI_SAFE_CMPXCHG 2011-08-03 11:12:37 -04:00