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

..

acpi

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

asm-generic

All Arch: remove linkage for sys_nfsservctl system call

2011-08-26 15:09:58 -07:00

crypto

net: remove mm.h inclusion from netdevice.h

2011-06-21 19:17:20 -07:00

drm

drm: Separate EDID Header Check from EDID Block Check

2011-08-04 14:39:35 +01:00

keys

encrypted-keys: add key format support

2011-06-27 09:10:45 -04:00

linux

Merge branch 'master' of github.com:davem330/net

2011-09-22 03:23:13 -04:00

math-emu

…

media

[media] V4L: initial driver for ov5642 CMOS sensor

2011-07-27 17:56:09 -03:00

mtd

…

net

Merge branch 'master' of github.com:davem330/net

2011-09-22 03:23:13 -04:00

pcmcia

pcmcia: add PCMCIA_DEVICE_MANF_CARD_PROD_ID3

2011-08-08 16:04:11 -04:00

rdma

net: consolidate and fix ethtool_ops->get_settings calling

2011-09-15 17:32:26 -04:00

rxrpc

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07:00

scsi

Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

2011-08-06 22:56:03 -07:00

sound

ASoC: omap: Update e-mail address of Jarkko Nikula

2011-08-12 11:45:10 +09:00

target

target: Make standard INQUIRY return 'not connected' for tpg_virt_lun0

2011-08-22 19:25:35 +00:00

trace

Merge branch 'for-linus' of git://git.kernel.dk/linux-block

2011-08-19 10:47:07 -07:00

video

OMAP: DSS2: Remove unused opt_clock_available

2011-07-25 10:22:05 +03:00

xen

xen/balloon: memory hotplug support for Xen balloon driver

2011-07-25 20:57:08 -07:00

Kbuild

…