Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Browse source

Conflicts:
	net/mac80211/sta_info.c
	net/wireless/core.h

Two minor conflicts in wireless.  Overlapping additions of extern
declarations in net/wireless/core.h and a bug fix overlapping with
the addition of a boolean parameter to __ieee80211_key_free().

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2013-04-01 13:36:50 -04:00

parent 7d4c04fc17 3658f36040

commit a210576cf8

202 changed files with 6008 additions and 4874 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

21

MAINTAINERS

View file

2

Makefile

View file

2

arch/arc/include/asm/dma-mapping.h

View file

3

arch/arc/include/asm/elf.h

View file

2

arch/arc/include/asm/entry.h

View file

6

arch/arc/include/asm/kgdb.h

View file

2

arch/arc/include/asm/ptrace.h

View file

2

arch/arc/include/asm/syscalls.h

View file

4

arch/arc/include/uapi/asm/ptrace.h

View file

27

arch/arc/kernel/entry.S

View file

1

arch/arc/kernel/kgdb.c

View file

4

arch/arc/kernel/setup.c

View file

2

arch/arc/kernel/sys.c

View file

2

arch/arm64/mm/mmu.c

View file

5

arch/ia64/kernel/process.c

View file

6

arch/powerpc/kernel/epapr_paravirt.c

View file

144

arch/powerpc/kernel/exceptions-64s.S

View file

23

arch/tile/kernel/setup.c

View file

4

arch/x86/include/asm/xen/hypercall.h

View file

1

arch/x86/include/uapi/asm/msr-index.h

View file

3

arch/x86/xen/mmu.c

View file

1

block/partition-generic.c

View file

2

drivers/acpi/apei/cper.c

View file

9

drivers/acpi/pci_root.c

View file

8

drivers/acpi/sleep.c

View file

4

drivers/block/Kconfig

View file

3

drivers/block/aoe/aoecmd.c

View file

2

drivers/block/cciss.c

View file

22

drivers/block/loop.c

View file

4

drivers/block/mg_disk.c

View file

4

drivers/block/mtip32xx/mtip32xx.c

View file

45

drivers/block/rbd.c

View file

2

drivers/block/rsxx/Makefile

View file

8

drivers/block/rsxx/config.c

View file

237

drivers/block/rsxx/core.c

View file

110

drivers/block/rsxx/cregs.c

View file

237

drivers/block/rsxx/dma.c

View file

6

drivers/block/rsxx/rsxx.h

View file

2

drivers/block/rsxx/rsxx_cfg.h

View file

34

drivers/block/rsxx/rsxx_priv.h

View file

66

drivers/block/xen-blkback/blkback.c

View file

40

drivers/block/xen-blkback/common.h

View file

14

drivers/block/xen-blkback/xenbus.c

View file

152

drivers/block/xen-blkfront.c

View file

2

drivers/cpufreq/acpi-cpufreq.c

View file

10

drivers/cpufreq/cpufreq_stats.c

View file

34

drivers/cpufreq/intel_pstate.c

View file

27

drivers/crypto/caam/caamalg.c

View file

1

drivers/crypto/caam/compat.h

View file

30

drivers/crypto/talitos.c

View file

23

drivers/dma/dw_dmac.c

View file

1

drivers/dma/dw_dmac_regs.h

View file

81

drivers/extcon/extcon-max77693.c

View file

40

drivers/extcon/extcon-max8997.c

View file

6

drivers/hid/hid-ids.h

View file

6

drivers/hid/hid-multitouch.c

View file

2

drivers/hid/usbhid/hid-quirks.c

View file

2

drivers/media/i2c/m5mols/m5mols_core.c

View file

16

drivers/media/pci/bt8xx/bttv-driver.c

View file

8

drivers/media/platform/exynos-gsc/gsc-core.c

View file

6

drivers/media/platform/s5p-fimc/fimc-core.c

View file

8

drivers/media/platform/s5p-fimc/fimc-lite-reg.c

View file

1

drivers/media/platform/s5p-fimc/fimc-lite.c

View file

29

drivers/media/platform/s5p-fimc/fimc-mdevice.c

View file

2

drivers/media/platform/s5p-mfc/s5p_mfc.c

View file

1

drivers/media/platform/s5p-mfc/s5p_mfc_enc.c

View file

2

drivers/media/rc/Kconfig

View file

2

drivers/media/v4l2-core/Makefile

View file

29

drivers/misc/mei/hw-me.c

View file

18

drivers/misc/mei/init.c

View file

1

drivers/misc/mei/mei_dev.h

View file

52

drivers/misc/mei/pci-me.c

View file

4

drivers/misc/vmw_vmci/vmci_datagram.c

View file

32

drivers/net/bonding/bond_sysfs.c

View file

1

drivers/net/can/sja1000/Kconfig

View file

4

drivers/net/can/sja1000/plx_pci.c

View file

6

drivers/net/can/sja1000/sja1000.c

View file

2

drivers/net/can/sja1000/sja1000.h

View file

1

drivers/net/ethernet/atheros/atl1e/atl1e.h

View file

19

drivers/net/ethernet/atheros/atl1e/atl1e_main.c

View file

7

drivers/net/ethernet/broadcom/tg3.c

View file

9

drivers/net/ethernet/calxeda/xgmac.c

View file

214

drivers/net/ethernet/davicom/dm9000.c

View file

11

drivers/net/ethernet/davicom/dm9000.h

View file

82

drivers/net/ethernet/freescale/fec_main.c

View file

14

drivers/net/ethernet/intel/e1000/e1000_ethtool.c

View file

7

drivers/net/ethernet/intel/e1000e/netdev.c

View file

7

drivers/net/ethernet/intel/ixgb/ixgb_main.c

View file

2

drivers/net/ethernet/marvell/sky2.c

View file

2

drivers/net/ethernet/marvell/sky2.h

View file

2

drivers/net/ethernet/micrel/ks8851.c

View file

28

drivers/net/ethernet/renesas/sh_eth.c

View file

2

drivers/net/ethernet/renesas/sh_eth.h

View file

2

drivers/net/ethernet/ti/cpsw.c

View file

2

drivers/net/ethernet/ti/davinci_emac.c

View file

12

drivers/net/usb/smsc75xx.c

View file

1

drivers/net/wireless/ath/ath9k/link.c

View file

59

drivers/net/wireless/b43/dma.c

View file

8

drivers/net/wireless/b43/phy_n.c

View file

177

drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c

View file

Some files were not shown because too many files have changed in this diff Show more